Changeset 1987

Timestamp:

07/26/07 17:22:15 (1 year ago)

Author:

jhuntwork

Message:

Merged r1950 to x86_64 branch

Files:

• branches/x86_64/packages/initramfs/Makefile (modified) (1 diff)
• branches/x86_64/packages/initramfs/init.in (modified) (8 diffs)
• branches/x86_64/scripts/shutdown-helper (modified) (2 diffs)

branches/x86_64/packages/initramfs/Makefile

@@ -43 +43 @@
-        cp /usr/sbin/dmsetup $(WDIR)/sbin
-        find /lib/modules/*/kernel/drivers/{ata,base,block,cdrom,ide,ieee1394,firewire,hid,message,scsi,pcmcia,usb/{core,host,storage}} \
-
+jbd,
-            /lib/modules/*/kernel/lib -type f | cpio --make-directories -p $(WDIR)
-        for a in /lib/modules/* ; do ver=$${a##*/} ; depmod -b $(WDIR) $$ver ; done

branches/x86_64/packages/initramfs/init.in

@@ -10 +10 @@
-root=
-rootdelay=
-ext3,ext2,
+
-ro="ro"
-noresume=0
@@ -82 +82 @@
-        umount -n /.tmpfs/.cdrom
-        /sbin/losetup /dev/loop2 /.tmpfs/.fakecd.iso
+        if [ -d /.tmpfs/.partition ] ; then
+                /sbin/losetup -d /dev/loop3
+                umount -n /.tmpfs/.partition && rm -rf /.tmpfs/.partition
+        fi
-        ln -sf /dev/loop2 /dev/lfs-cd
-}
@@ -98 +102 @@
-        umount -n /.tmpfs/.cdrom
-}
-
-
-do_mount_cd() {
@@ -136 +139 @@
-                fi
-        done
-        mkdir /.tmpfs
-        mount -n -t tmpfs -o size=90% tmpfs /.tmpfs
-        mkdir /.tmpfs/.cdrom
-        detect_cd_type
@@ -151 +152 @@
-        mount -n -t ext2 /dev/mapper/lfs-cd /.root
-        mount -n --move /.tmpfs /.root/dev/shm
+        if [ "$toram" != 1 ] && [ ! -d /.root/dev/shm/.partition ] ; then
+                cp -a /dev/lfs-cd /.root/dev/lfs-cd
+        fi
-        if [ "$toram" != 1 ] ; then
-                cp -a /dev/lfs-cd /.root/dev/lfs-cd
-                ln -sf /dev/shm/.cdrom/drivers /.root/drivers
-        fi
@@ -163 +166 @@
-                rm -f /.root/etc/udev/rules.d/76-network.rules
-        fi
+}
+
+do_mount_iso() {
+        DEVICE=${root#iso:}
+        FILE=${DEVICE#*:}
+        DEVICE=${DEVICE%%:*}
+        mkdir /.tmpfs/.partition
+        mount -n -t "$rootfstype" -o "$rootflags" "$DEVICE" /.tmpfs/.partition
+        /sbin/losetup /dev/loop3 "/.tmpfs/.partition/$FILE"
+        ln -sf /dev/loop3 /dev/lfs-cd
+        do_mount_cd
-}
-
@@ -170 +184 @@
-        rootflags="$rootflags$ro"
-        case "$root" in
+        iso:*)
+                mkdir /.tmpfs
+                mount -n -t tmpfs -o size=90% tmpfs /.tmpfs
+                do_mount_iso
+                ;;
-        *:*)
-                ( IFS=":" ; mknod /dev/root b $root )
@@ -178 +197 @@
-                ;;
-        "")
+                mkdir /.tmpfs
+                mount -n -t tmpfs -o size=90% tmpfs /.tmpfs
-                do_mount_cd
-                ;;

branches/x86_64/scripts/shutdown-helper

@@ -24 +24 @@
-/dev/console
-/dev/null
-/dev/lfs-cd
-/dev/loop0
+/dev/loop3
-/dev/mapper/control"
-
@@ -69 +69 @@
-done
-[ "\$TIMEOUT" = "....." ] && fail
+
-dmsetup remove_all || fail
-losetup -d /dev/loop0 || fail
-umount -n /.cdrom || fail
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-halt
-EOF