livecd: linuxrc, rc.live, remaster/livecd_gen_initrd, remaster/liv...
havner
havner at pld-linux.org
Mon Feb 27 17:28:53 CET 2006
Author: havner Date: Mon Feb 27 16:28:53 2006 GMT
Module: livecd Tag: HEAD
---- Log message:
- numerous changes
---- Files affected:
livecd:
linuxrc (1.17 -> 1.18) , rc.live (1.23 -> 1.24)
livecd/remaster:
livecd_gen_initrd (1.4 -> 1.5) , livecd_gen_iso (1.13 -> 1.14) , livecd_remaster_config (1.5 -> 1.6) , livecd_remaster_prep (1.13 -> 1.14)
---- Diffs:
================================================================
Index: livecd/linuxrc
diff -u livecd/linuxrc:1.17 livecd/linuxrc:1.18
--- livecd/linuxrc:1.17 Fri Jan 27 02:03:29 2006
+++ livecd/linuxrc Mon Feb 27 17:28:48 2006
@@ -59,10 +59,10 @@
if getparam debug > /dev/null; then
LOG=/dev/console
- dmesg -n 7
+ echo 7 > /proc/sys/kernel/printk
else
LOG=/dev/null
- dmesg -n 5
+ echo 5 > /proc/sys/kernel/printk
fi
echo "${BLUE}Loading modules${NORMAL}"
@@ -126,7 +126,7 @@
modprobe ide-cd > $LOG 2>&1
fi
-if getparam shell1 > /dev/null; then
+if getparam shell > /dev/null; then
/bin/sh
fi
@@ -144,7 +144,7 @@
mount -n -o ro -t $HDD_fs /dev/$HDD_dev /rootfs/mnt/hd
mount -n -o ro,loop -t iso9660 /rootfs/mnt/hd/pldcd.iso /rootfs/media/LiveCD
else
- echo "0" > /proc/sys/kernel/printk
+ echo 0 > /proc/sys/kernel/printk
echo "${MAGENTA}Searching for PLD Live CDROM${NORMAL}"
DEVICES="$DEVICES /dev/hd[cd] /dev/hd[ab] /dev/scd[0-9] /dev/hd[e-l]"
for I in $DEVICES
@@ -155,22 +155,24 @@
if test -f /rootfs/media/LiveCD/pldcd
then
echo "${CRE}${GREEN}PLD Live CDROM found at ${MAGENTA}${I}${GREEN}...${NORMAL}"
- HAVNIX="${I}"
+ PLDLIVECD="${I}"
break
fi
umount -n /rootfs/media/LiveCD > $LOG 2>&1
fi
done
- if [ "$HAVNIX" = "" ]; then
- echo "${CRE}${RED}PLD Live CDROM not found !!! Either your controller has not been"
- echo "properly detected or you have ejected CD during boot."
- echo "Try running with debug option. Restart your computer now and send bugreport.${NORMAL}"
+ if [ "$PLDLIVECD" = "" ]; then
+ echo "${CRE}${RED}PLD Live CDROM not found !!! Either your controller has not"
+ echo "been properly detected or you have ejected CD during boot."
+ echo "Try running with debug option."
+ echo ""
+ echo "Restart your computer now and send bugreport.${NORMAL}"
read NOTHING
fi
if getparam debug > /dev/null; then
- dmesg -n 7
+ echo 7 > /proc/sys/kernel/printk
else
- dmesg -n 5
+ echo 5 > /proc/sys/kernel/printk
fi
fi
@@ -199,17 +201,12 @@
mount2 /rootfs/media/LiveCD/pldcd
fi
-
if getparam X > /dev/null || getparam x > /dev/null; then
INITPARAM="5 "
fi
if getparam noX > /dev/null || getparam nox > /dev/null; then
INITPARAM="3 "
-fi
-
-if getparam shell2 > /dev/null; then
- /bin/sh
fi
echo "${BLUE}Changing rootfs${NORMAL}"
================================================================
Index: livecd/rc.live
diff -u livecd/rc.live:1.23 livecd/rc.live:1.24
--- livecd/rc.live:1.23 Fri Jan 27 02:03:29 2006
+++ livecd/rc.live Mon Feb 27 17:28:48 2006
@@ -10,7 +10,7 @@
. /etc/rc.d/init.d/functions
. /etc/rc.d/init.d/functions-live
-./etc/sysconfig/system # for $CONSOLE_LOGLEVEL
+. /etc/sysconfig/system # for $CONSOLE_LOGLEVEL
touch /fastboot
@@ -19,8 +19,6 @@
dmesg -n 7
fi
-/sbin/service hotplug start
-
LNORMAL="`termput op`"
LGREENB="`termput setaf 2 1`"
LBLUEB="`termput setaf 4 1`"
@@ -176,6 +174,9 @@
echo -n "Usb${COUNT}: ${I}"
let $((++COUNT))
done
+modprobe uhci-hcd >/dev/null 2>&1
+modprobe ohci-hcd >/dev/null 2>&1
+modprobe ehci-hcd >/dev/null 2>&1
COUNT=0
PCMCIA=0
@@ -409,14 +410,12 @@
COUNT=0
for I in `get_cdroms`; do
if [ ${COUNT} -eq 0 ]; then
- ln -s /dev/$I /dev/cdrom
+ #ln -s /dev/$I /dev/cdrom
echo /dev/cdrom /media/cdrom auto user,noauto,iocharset=iso8859-2,exec,ro 0 0 >> /etc/fstab
- chgrp cdwrite /dev/$I
else
- ln -s /dev/$I /dev/cdrom${COUNT}
+ #ln -s /dev/$I /dev/cdrom${COUNT}
echo /dev/cdrom${COUNT} /media/cdrom${COUNT} auto user,noauto,iocharset=iso8859-2,exec,ro 0 0 >> /etc/fstab
mkdir /media/cdrom${COUNT}
- chgrp cdwrite /dev/$I
fi
let $((++COUNT))
done
@@ -521,7 +520,10 @@
fi
if [ -x /media/floppy/${I}.exec ]; then
echo "${LBLUEB}Executing profile file (${I})${LNORMAL}"
- /media/floppy/${I}.exec
+ cp /media/floppy/${I}.exec /tmp
+ chmod 755 /tmp/${I}.exec
+ /tmp/${I}.exec
+ rm -f /tmp/${I}.exec
fi
done
umount -n /media/floppy > $LOG 2>&1
================================================================
Index: livecd/remaster/livecd_gen_initrd
diff -u livecd/remaster/livecd_gen_initrd:1.4 livecd/remaster/livecd_gen_initrd:1.5
--- livecd/remaster/livecd_gen_initrd:1.4 Thu Jan 26 21:49:19 2006
+++ livecd/remaster/livecd_gen_initrd Mon Feb 27 17:28:48 2006
@@ -32,6 +32,8 @@
drivers/scsi/qla2xxx \
drivers/scsi/aacraid \
drivers/scsi/pcmcia \
+ drivers/scsi/lpfc \
+ drivers/scsi/megaraid \
drivers/scsi/aic7xxx \
drivers/scsi/sym53c8xx_2 \
drivers/block \
@@ -48,6 +50,7 @@
drivers/ide/pci/sis5513.ko \
drivers/ide/pci/amd74xx.ko \
drivers/ide/pci/cy82c693.ko \
+ drivers/ide/pci/generic.ko \
drivers/ide/pci/ns87415.ko \
drivers/ide/pci/opti621.ko \
drivers/ide/pci/pdc202xx_new.ko \
@@ -63,6 +66,7 @@
drivers/ide/pci/cmd64x.ko \
drivers/ide/pci/hpt366.ko \
drivers/ide/pci/hpt34x.ko \
+ drivers/ide/pci/it821x.ko \
drivers/ide/pci/alim15x3.ko \
drivers/ide/pci/trm290.ko \
drivers/ide/pci/aec62xx.ko \
@@ -77,79 +81,91 @@
drivers/ide/legacy/ide-cs.ko \
drivers/ide/ide-generic.ko \
drivers/ide/ide-cd.ko \
- drivers/scsi/qla1280.ko \
- drivers/scsi/qla2xxx/qla2100.ko \
- drivers/scsi/qla2xxx/qla2200.ko \
- drivers/scsi/qla2xxx/qla2300.ko \
- drivers/scsi/qla2xxx/qla2322.ko \
- drivers/scsi/qla2xxx/qla2xxx.ko \
- drivers/scsi/qla2xxx/qla6312.ko \
- drivers/scsi/scsi_transport_spi.ko \
- drivers/scsi/ultrastor.ko \
- drivers/scsi/sata_sil.ko \
- drivers/scsi/sata_sis.ko \
- drivers/scsi/sata_sx4.ko \
- drivers/scsi/sata_svw.ko \
- drivers/scsi/dmx3191d.ko \
- drivers/scsi/sata_via.ko \
- drivers/scsi/sata_vsc.ko \
- drivers/scsi/sg.ko \
- drivers/scsi/st.ko \
- drivers/scsi/qlogicfas.ko \
- drivers/scsi/eata.ko \
- drivers/scsi/qlogicfc.ko \
- drivers/scsi/sr_mod.ko \
- drivers/scsi/ide-scsi.ko \
- drivers/scsi/qlogicisp.ko \
- drivers/scsi/BusLogic.ko \
- drivers/scsi/scsi_transport_fc.ko \
- drivers/scsi/pas16.ko \
- drivers/scsi/wd7000.ko \
- drivers/scsi/a100u2w.ko \
- drivers/scsi/sym53c416.ko \
- drivers/scsi/aic7xxx_old.ko \
- drivers/scsi/dc395x.ko \
- drivers/scsi/tmscsim.ko \
- drivers/scsi/g_NCR5380_mmio.ko \
- drivers/scsi/fdomain.ko \
- drivers/scsi/u14-34f.ko \
- drivers/scsi/dtc.ko \
- drivers/scsi/gdth.ko \
- drivers/scsi/initio.ko \
- drivers/scsi/in2000.ko \
- drivers/scsi/3w-xxxx.ko \
- drivers/scsi/imm.ko \
- drivers/scsi/ipr.ko \
- drivers/scsi/ips.ko \
- drivers/scsi/aacraid/aacraid.ko \
- drivers/scsi/nsp32.ko \
- drivers/scsi/pcmcia/qlogic_cs.ko \
- drivers/scsi/pcmcia/nsp_cs.ko \
- drivers/scsi/pcmcia/aha152x_cs.ko \
- drivers/scsi/pcmcia/fdomain_cs.ko \
- drivers/scsi/pcmcia/sym53c500_cs.ko \
- drivers/scsi/t128.ko \
- drivers/scsi/ppa.ko \
- drivers/scsi/aic7xxx/aic7xxx.ko \
- drivers/scsi/aic7xxx/aic79xx.ko \
- drivers/scsi/scsi_mod.ko \
- drivers/scsi/aha1542.ko \
- drivers/scsi/aha152x.ko \
- drivers/scsi/atp870u.ko \
- drivers/scsi/sd_mod.ko \
- drivers/scsi/sata_promise.ko \
- drivers/scsi/sym53c8xx_2/sym53c8xx.ko \
- drivers/scsi/psi240i.ko \
- drivers/scsi/megaraid.ko \
- drivers/scsi/eata_pio.ko \
- drivers/scsi/g_NCR5380.ko \
- drivers/scsi/osst.ko \
- drivers/scsi/NCR53c406a.ko \
- drivers/scsi/ata_piix.ko \
- drivers/scsi/qlogicfas408.ko \
- drivers/scsi/dpt_i2o.ko \
- drivers/scsi/libata.ko \
- drivers/scsi/advansys.ko \
+drivers/scsi/scsi_transport_fc.ko \
+drivers/scsi/3w-9xxx.ko \
+drivers/scsi/tmscsim.ko \
+drivers/scsi/3w-xxxx.ko \
+drivers/scsi/u14-34f.ko \
+drivers/scsi/BusLogic.ko \
+drivers/scsi/ultrastor.ko \
+drivers/scsi/NCR53c406a.ko \
+drivers/scsi/wd7000.ko \
+drivers/scsi/a100u2w.ko \
+drivers/scsi/aacraid/aacraid.ko \
+drivers/scsi/advansys.ko \
+drivers/scsi/aha152x.ko \
+drivers/scsi/aha1542.ko \
+drivers/scsi/ahci.ko \
+drivers/scsi/aic7xxx/aic79xx.ko \
+drivers/scsi/aic7xxx/aic7xxx.ko \
+drivers/scsi/aic7xxx_old.ko \
+drivers/scsi/ata_piix.ko \
+drivers/scsi/atp870u.ko \
+drivers/scsi/ch.ko \
+drivers/scsi/dc395x.ko \
+drivers/scsi/dmx3191d.ko \
+drivers/scsi/dpt_i2o.ko \
+drivers/scsi/dtc.ko \
+drivers/scsi/eata.ko \
+drivers/scsi/fdomain.ko \
+drivers/scsi/g_NCR5380.ko \
+drivers/scsi/g_NCR5380_mmio.ko \
+drivers/scsi/gdth.ko \
+drivers/scsi/ide-scsi.ko \
+drivers/scsi/imm.ko \
+drivers/scsi/in2000.ko \
+drivers/scsi/initio.ko \
+drivers/scsi/ipr.ko \
+drivers/scsi/ips.ko \
+drivers/scsi/libata.ko \
+drivers/scsi/lpfc/lpfc.ko \
+drivers/scsi/megaraid/megaraid_mbox.ko \
+drivers/scsi/megaraid/megaraid_mm.ko \
+drivers/scsi/megaraid/megaraid_sas.ko \
+drivers/scsi/megaraid.ko \
+drivers/scsi/nsp32.ko \
+drivers/scsi/osst.ko \
+drivers/scsi/pas16.ko \
+drivers/scsi/ppa.ko \
+drivers/scsi/psi240i.ko \
+drivers/scsi/qla1280.ko \
+drivers/scsi/qla2xxx/qla2100.ko \
+drivers/scsi/qla2xxx/qla2200.ko \
+drivers/scsi/qla2xxx/qla2300.ko \
+drivers/scsi/qla2xxx/qla2322.ko \
+drivers/scsi/qla2xxx/qla2xxx.ko \
+drivers/scsi/qla2xxx/qla6312.ko \
+drivers/scsi/qlogicfas.ko \
+drivers/scsi/qlogicfas408.ko \
+drivers/scsi/qlogicfc.ko \
+drivers/scsi/raid_class.ko \
+drivers/scsi/sata_mv.ko \
+drivers/scsi/sata_nv.ko \
+drivers/scsi/sata_promise.ko \
+drivers/scsi/sata_qstor.ko \
+drivers/scsi/sata_sil.ko \
+drivers/scsi/sata_sis.ko \
+drivers/scsi/sata_svw.ko \
+drivers/scsi/sata_sx4.ko \
+drivers/scsi/sata_uli.ko \
+drivers/scsi/sata_via.ko \
+drivers/scsi/sata_vsc.ko \
+drivers/scsi/scsi_mod.ko \
+drivers/scsi/sym53c416.ko \
+drivers/scsi/scsi_transport_iscsi.ko \
+drivers/scsi/pcmcia/aha152x_cs.ko \
+drivers/scsi/pcmcia/fdomain_cs.ko \
+drivers/scsi/pcmcia/nsp_cs.ko \
+drivers/scsi/pcmcia/qlogic_cs.ko \
+drivers/scsi/pcmcia/sym53c500_cs.ko \
+drivers/scsi/scsi_transport_sas.ko \
+drivers/scsi/t128.ko \
+drivers/scsi/scsi_transport_spi.ko \
+drivers/scsi/sd_mod.ko \
+drivers/scsi/sg.ko \
+drivers/scsi/sr_mod.ko \
+drivers/scsi/st.ko \
+drivers/scsi/sym53c8xx_2/sym53c8xx.ko \
drivers/block/loop.ko \
drivers/cdrom/sbpcd.ko \
drivers/cdrom/sjcd.ko \
@@ -200,7 +216,7 @@
done;
echo "Calculating dependencies..."
-depmod -a -b $INITRD -F $CD/boot/System.map $V-$R
+depmod -a -b $INITRD -F $ROOTFS/boot/System.map $V-$R
echo "Copying kernel image..."
cp -f $ROOTFS/boot/vmlinuz $CD/boot
================================================================
Index: livecd/remaster/livecd_gen_iso
diff -u livecd/remaster/livecd_gen_iso:1.13 livecd/remaster/livecd_gen_iso:1.14
--- livecd/remaster/livecd_gen_iso:1.13 Fri Jan 27 02:03:29 2006
+++ livecd/remaster/livecd_gen_iso Mon Feb 27 17:28:48 2006
@@ -19,17 +19,17 @@
exit 1
fi
-if [ ! -f "`which busybox`" ]; then
+if [ ! -x "`which busybox`" ]; then
echo "Install busybox (poldek -i busybox) before running this script"
exit 1
fi
-if [ ! -f "`which mksquashfs`" ]; then
+if [ ! -x "`which mksquashfs`" ]; then
echo "Install squashfs (poldek -i squashfs) before running this script"
exit 1
fi
-if [ ! -f "`which mkisofs`" ]; then
+if [ ! -x "`which mkisofs`" ]; then
echo "Install mkisofs (poldek -i cdrtools-mkisofs) before running this script"
exit 1
fi
@@ -37,7 +37,7 @@
# preparation, external scripts
echo "Running livecd_gen_initrd to prepare/fix livecd internal initrd."
-if [ ! -f "`which livecd_gen_initrd`" ]; then
+if [ ! -x "`which livecd_gen_initrd`" ]; then
echo "There is no livecd_gen_initrd script."
exit 1
fi
================================================================
Index: livecd/remaster/livecd_remaster_config
diff -u livecd/remaster/livecd_remaster_config:1.5 livecd/remaster/livecd_remaster_config:1.6
--- livecd/remaster/livecd_remaster_config:1.5 Sun Dec 19 23:23:28 2004
+++ livecd/remaster/livecd_remaster_config Mon Feb 27 17:28:48 2006
@@ -1,9 +1,14 @@
+# main
MAINDIR=~/LIVECD
-MNT_CDROM=/media/cdrom
-MNT_INITRD=$MAINDIR/mnt_initrd
-MNT_SQUASHFS=$MAINDIR/mnt_squashfs
CD=$MAINDIR/CD
INITRD=$MAINDIR/INITRD
-SQUASHFS=$MAINDIR/SQUASHFS
ROOTFS=$MAINDIR/ROOTFS
-ISODIR=$MAINDIR
+ISODIR=$MAINDIR # generated iso will be placed here
+
+# temp
+SQUASHFS=$MAINDIR/SQUASHFS
+
+# remaster_prep
+MNT_CDROM=/media/cdrom
+MNT_INITRD=$MAINDIR/mnt_initrd
+MNT_SQUASHFS=$MAINDIR/mnt_squashfs
================================================================
Index: livecd/remaster/livecd_remaster_prep
diff -u livecd/remaster/livecd_remaster_prep:1.13 livecd/remaster/livecd_remaster_prep:1.14
--- livecd/remaster/livecd_remaster_prep:1.13 Fri Jan 27 02:03:29 2006
+++ livecd/remaster/livecd_remaster_prep Mon Feb 27 17:28:48 2006
@@ -14,15 +14,20 @@
else
echo "There is no config file in your home dir"
cat >> ~/.livecd_remaster << EOF
+# main
MAINDIR=~/LIVECD
-MNT_CDROM=/media/cdrom
-MNT_INITRD=\$MAINDIR/mnt_initrd
-MNT_SQUASHFS=\$MAINDIR/mnt_squashfs
CD=\$MAINDIR/CD
INITRD=\$MAINDIR/INITRD
-SQUASHFS=\$MAINDIR/SQUASHFS
ROOTFS=\$MAINDIR/ROOTFS
-ISODIR=\$MAINDIR
+ISODIR=\$MAINDIR # generated iso will be placed here
+
+# temp
+SQUASHFS=\$MAINDIR/SQUASHFS
+
+# remaster_prep
+MNT_CDROM=/media/cdrom
+MNT_INITRD=\$MAINDIR/mnt_initrd
+MNT_SQUASHFS=\$MAINDIR/mnt_squashfs
EOF
echo "${HOME}/.livecd_remaster generated. Please have a look at this file"
echo "and read README before using this script."
================================================================
---- CVS-web:
http://cvs.pld-linux.org/livecd/linuxrc?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/livecd/rc.live?r1=1.23&r2=1.24&f=u
http://cvs.pld-linux.org/livecd/remaster/livecd_gen_initrd?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/livecd/remaster/livecd_gen_iso?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/livecd/remaster/livecd_remaster_config?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/livecd/remaster/livecd_remaster_prep?r1=1.13&r2=1.14&f=u
More information about the pld-cvs-commit
mailing list