Author: havner Date: Wed Jul 12 11:02:19 2006 GMT
Module: livecd Tag: HEAD
---- Log message:
- s/pldcd/squashfs s/pldram/ramdisk.tgz
---- Files affected:
livecd:
linuxrc (1.26 -> 1.27) , livecd.sysconfig (1.4 -> 1.5)
livecd/remaster:
livecd_gen_iso (1.23 -> 1.24) , livecd_remaster_prep (1.17 -> 1.18)
---- Diffs:
================================================================
Index: livecd/linuxrc
diff -u livecd/linuxrc:1.26 livecd/linuxrc:1.27
--- livecd/linuxrc:1.26 Wed Jul 12 11:03:00 2006
+++ livecd/linuxrc Wed Jul 12 13:02:14 2006
@@ -152,8 +152,7 @@
echo -n "${CRE}${BLUE}Looking for CDROM in:
${MAGENTA}${I}${NORMAL} "
if mount -n -o ro -t iso9660 "${I}" /rootfs/media/LiveCD > $LOG
2>&1
then
- if test -f /rootfs/media/LiveCD/pldcd
- then
+ if [ -f /rootfs/media/LiveCD/squashfs ]; then
echo "${CRE}${GREEN}PLD Live CDROM found at
${MAGENTA}${I}${GREEN}...${NORMAL}"
PLDLIVECD="${I}"
break
@@ -173,7 +172,7 @@
if getparam md5 > /dev/null; then
echo "${MAGENTA}Checking md5sum, please wait...${NORMAL}"
- if [ "`cd /rootfs/media/LiveCD; md5sum pldcd`" = "`cat
/rootfs/media/LiveCD/pldcd.md5`" ]; then
+ if [ "`cd /rootfs/media/LiveCD; md5sum squashfs`" = "`cat
/rootfs/media/LiveCD/squashfs.md5`" ]; then
echo "${GREEN}Md5sum ok.${NORMAL}"
else
echo -n "${RED}Md5sum mismatch, press enter if you want to
continue.${NORMAL}"
@@ -182,18 +181,18 @@
fi
cd /rootfs
-tar xzpf /rootfs/media/LiveCD/pldram
+tar xzpf /rootfs/media/LiveCD/ramdisk.tgz
cd /
if getparam copycd > /dev/null; then
echo "${YELLOW}Copying iso to ram, please wait...${NORMAL}"
- cp /rootfs/media/LiveCD/pldcd /rootfs
+ cp /rootfs/media/LiveCD/squashfs /rootfs
umount /rootfs/media/LiveCD > $LOG 2>&1
rm -rf /rootfs/media/LiveCD
echo "${YELLOW}Done, you can now eject your cdrom${NORMAL}"
- losetup /dev/loop7 /rootfs/pldcd
+ losetup /dev/loop7 /rootfs/squashfs
else
- losetup /dev/loop7 /rootfs/media/LiveCD/pldcd
+ losetup /dev/loop7 /rootfs/media/LiveCD/squashfs
fi
mount -n -t squashfs -o ro /dev/loop7 /rootfs/live
================================================================
Index: livecd/livecd.sysconfig
diff -u livecd/livecd.sysconfig:1.4 livecd/livecd.sysconfig:1.5
--- livecd/livecd.sysconfig:1.4 Wed Jul 12 11:11:31 2006
+++ livecd/livecd.sysconfig Wed Jul 12 13:02:14 2006
@@ -22,5 +22,6 @@
# for all cards)
CONFIG_MIXER=yes
-# Text written before every livecd specific rc-scripts line
+# Text and its color written before every livecd specific rc-scripts line
CHARS="LiveCD: "
+CCHARS="$GREEN"
================================================================
Index: livecd/remaster/livecd_gen_iso
diff -u livecd/remaster/livecd_gen_iso:1.23 livecd/remaster/livecd_gen_iso:1.24
--- livecd/remaster/livecd_gen_iso:1.23 Wed Jul 12 12:53:08 2006
+++ livecd/remaster/livecd_gen_iso Wed Jul 12 13:02:14 2006
@@ -93,21 +93,21 @@
mkdir $ROOTFS/usr
mkdir $ROOTFS/boot
-echo -n "Generating pldram... "
-rm -rf $CD/pldram
+echo -n "Generating ramdisk.tgz... "
+rm -f $CD/ramdisk.tgz
cd $ROOTFS
-busybox tar -czf $CD/pldram *
+busybox tar -czf $CD/ramdisk.tgz *
[ "$?" != 0 ] && echo fail && exit 1
echo done
if [ ! "$NOSQUASHFS" = "yes" ]; then
echo "Generating squashfs... "
- rm -rf $CD/pldcd
- mksquashfs $SQUASHFS/ $CD/pldcd #-info
+ rm -f $CD/squashfs
+ mksquashfs $SQUASHFS/ $CD/squashfs #-info
[ "$?" != 0 ] && echo fail && exit 1
- chmod 644 $CD/pldcd
+ chmod 644 $CD/squashfs
cd $CD
- md5sum pldcd > $CD/pldcd.md5
+ md5sum squashfs > $CD/squashfs.md5
echo done
fi
================================================================
Index: livecd/remaster/livecd_remaster_prep
diff -u livecd/remaster/livecd_remaster_prep:1.17
livecd/remaster/livecd_remaster_prep:1.18
--- livecd/remaster/livecd_remaster_prep:1.17 Wed Jul 12 12:53:08 2006
+++ livecd/remaster/livecd_remaster_prep Wed Jul 12 13:02:14 2006
@@ -18,7 +18,7 @@
mount $MNT_CDROM
-if [ ! -f $MNT_CDROM/pldcd ]; then
+if [ ! -f $MNT_CDROM/squashfs ]; then
echo "You must insert PLD Live CD"
umount $MNT_CDROM > /dev/null 2>&1
exit 1
@@ -44,9 +44,9 @@
rm -rf $CD/boot/initrd
cd $ROOTFS
-tar xzpf $MNT_CDROM/pldram
+tar xzpf $MNT_CDROM/ramdisk.tgz
-mount -o loop -t squashfs $MNT_CDROM/pldcd $MNT_SQUASHFS
+mount -o loop -t squashfs $MNT_CDROM/squashfs $MNT_SQUASHFS
cp -dpR $MNT_SQUASHFS/* $ROOTFS/live
umount $MNT_SQUASHFS
rm -rf $MNT_SQUASHFS
================================================================
---- CVS-web:
http://cvs.pld-linux.org/livecd/linuxrc?r1=1.26&r2=1.27&f=u
http://cvs.pld-linux.org/livecd/livecd.sysconfig?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/livecd/remaster/livecd_gen_iso?r1=1.23&r2=1.24&f=u
http://cvs.pld-linux.org/livecd/remaster/livecd_remaster_prep?r1=1.17&r2=1.18&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
