Changeset 1926

Timestamp:

06/23/07 23:25:17 (19 months ago)

Author:

alexander

Message:

Switch the greeting based on availability of LFS sources on the CD

Location:

trunk

Files:

• Makefile (modified) (5 diffs)
• etc/issue.fullcd (moved) (moved from trunk/etc/issue)
• etc/issue.nosrc (added)
• etc/issue.toram (added)
• packages/initramfs/init.in (modified) (5 diffs)

trunk/Makefile

@@ -115 +115 @@
         mkdir -p $(MP) $(MPBASE)$(SRC) $(MPBASE)$(WD)/bin $(MPBASE)/iso/boot
         mount -o loop root.ext2 $(MP)
-        -rm -f $(MP)/boot $(MP)$(LFSSRC)
+        -rm -f $(MP)/boot
         mkdir -p $(MKTREE) $(MP)$(SRC) $(MP)$(WD)
         mkdir -p $(MP)/boot $(MP)$(LFSSRC) $(MPBASE)/iso$(LFSSRC)
@@ -187 +187 @@
         @chroot "$(MP)" $(chenv-blfs) 'set +h && cd $(ROOT) && \
          make blfs $(chbash-post-bash)'
-        @install -m644 etc/issue $(MP)/etc/issue
+        @install -m644 etc/issue* $(MP)/etc
 
 lfsuser:
@@ -363 +363 @@
         mandb -c 2>/dev/null
         echo 'dummy / ext2 defaults 0 0' >/etc/mtab
-        updatedb --prunepaths='/sources /tools /lfs-livecd /proc /sys /dev /tmp /var/tmp'
+        updatedb --prunepaths='/sources /tools /lfs-livecd /lfs-sources /proc /sys /dev /tmp /var/tmp'
         echo >/etc/mtab
 
@@ -380 +380 @@
         @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} $(MP)/boot/isolinux
         @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg
-        @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue
+        @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue*
         @install -m644 doc/README doc/lfscd-remastering-howto.txt $(MP)/root
         @sed -i "s/\[version\]/$(VERSION)/" $(MP)/root/README
@@ -442 +442 @@
         -rmdir $(MP)$(SRC) $(MP)$(WD) $(MP)$(ROOT)
         -rmdir $(MP)/boot $(MP)$(LFSSRC)
-        -ln -s /dev/shm/.cdrom/boot /dev/shm/.cdrom$(LFSSRC) $(MP)
+        -ln -s /dev/shm/.cdrom/boot $(MP)
         -umount $(MP)
 

trunk/packages/initramfs/init.in

@@ -15 +15 @@
 all_generic_ide=0
 toram=0
+cdtype=
 
 find_cd() {
@@ -42 +43 @@
 
 copy_cd_to_ram() {
+        echo "Copying LFS LiveCD to RAM. This will take several minutes..."
         mount -n -t iso9660 -o ro,norock /dev/lfs-cd /.tmpfs/.cdrom
         cat /fakecd.iso.head >/.tmpfs/.fakecd.iso
@@ -81 +83 @@
 }
 
+detect_cd_type() {
+        mount -n -t iso9660 -o ro /dev/lfs-cd /.tmpfs/.cdrom
+        if [ -d /.tmpfs/.cdrom/lfs-sources ] ; then
+                if [ "$toram" = 1 ] ; then
+                        cdtype=toram
+                else
+                        cdtype=fullcd
+                fi
+        else
+                cdtype=nosrc
+        fi
+        umount -n /.tmpfs/.cdrom
+}
+
+
 do_mount_cd() {
         i=1
@@ -120 +137 @@
         mount -n -t tmpfs -o size=90% tmpfs /.tmpfs
         mkdir /.tmpfs/.cdrom
+        detect_cd_type
         if [ "$toram" = 1 ] ; then copy_cd_to_ram ; fi
         mount -n -t iso9660 -o ro /dev/lfs-cd /.tmpfs/.cdrom
@@ -133 +151 @@
         if [ "$toram" != 1 ] ; then cp -a /dev/lfs-cd /.root/dev/lfs-cd ; fi
         cat /etc/modprobe.conf >>/.root/etc/modprobe.conf
+        ln -sf issue.$cdtype /.root/etc/issue
+        if [ "$cdtype" = "fullcd" ] ; then
+                ln -sf /dev/shm/.cdrom/lfs-sources /.root/lfs-sources
+        fi
 }