SOURCES: linux-live-package.patch - create devfs style /dev/loop n...

glen glen at pld-linux.org
Tue Oct 17 21:27:18 CEST 2006 

Author: glen                         Date: Tue Oct 17 19:27:18 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- create devfs style /dev/loop nodes (req by busybox)
- more pldize and secure paths

---- Files affected:
SOURCES:
   linux-live-package.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/linux-live-package.patch
diff -u SOURCES/linux-live-package.patch:1.5 SOURCES/linux-live-package.patch:1.6
--- SOURCES/linux-live-package.patch:1.5	Tue Oct 17 17:55:32 2006
+++ SOURCES/linux-live-package.patch	Tue Oct 17 21:27:13 2006
@@ -97,8 +97,8 @@
  cp -R DOC/* $CDDATA
  cp $VMLINUZ $CDDATA/boot/vmlinuz
  
---- linux-live-5.5.0/initrd/initrd_create	2006-10-15 22:51:08.000000000 +0300
-+++ linux-live-5.5.0/initrd/initrd_create	2006-10-17 16:28:34.000000000 +0300
+--- linux-live-5.5.0/initrd/initrd_create	2006-10-17 16:28:34.000000000 +0300
++++ linux-live-5.5.0/initrd/initrd_create	2006-10-17 19:42:57.000000000 +0300
 @@ -3,11 +3,12 @@
  #
  # Author:	  Tomas M. <http://www.linux-live.org>
@@ -140,20 +140,41 @@
     fi
  }
  
-@@ -58,12 +64,6 @@
-    exit 1
- fi
+@@ -48,21 +54,8 @@
+ ##################################################
+ # Create INITRD image now:
  
+-MOUNTDIR=/tmp/initrd_mountdir_$$
+-INITRD_TREE=/tmp/initrd_tree_$$
+-
+-if [ ! -d "kernel-modules/$KERNEL" ]; then
+-   echo "The directory `pwd`/kernel-modules/$KERNEL doesn't exist."
+-   echo "Please create it and copy squashfs.ko and unionfs.ko modules"
+-   echo "for your kernel ($KERNEL) to this directory."
+-   exit 1
+-fi
+-
 -if [ "`ls -1 rootfs/lib`" = "" ]; then
 -   echo "cannot find essential libc libraries."
 -   echo "please add ld-linux and libc.so to `pwd`./rootfs/lib"
 -   exit 1
 -fi
--
++MOUNTDIR=$(mktemp -d || echo /tmp/initrd_mountdir_$$)
++INITRD_TREE=$(mktemp -d || echo /tmp/initrd_tree_$$)
+ 
  debug "creating empty directory $INITRD_TREE"
  rm -Rf $INITRD_TREE
- mkdir $INITRD_TREE
-@@ -89,7 +89,8 @@
+@@ -81,15 +74,17 @@
+   mknod $INITRD_TREE/dev/tty$i c 4 $i;
+ done
+ 
++mkdir $INITRD_TREE/dev/loop
+ loops=255
+ while [ $loops -ge 0 ]; do
+-   mknod $INITRD_TREE/dev/loop$loops b 7 $loops
++   mknod $INITRD_TREE/dev/loop/$loops b 7 $loops
+    loops=$(($loops-1))
+ done
  
  debug "copying files to the rootdisk"
  touch $INITRD_TREE/etc/{m,fs}tab
@@ -163,7 +184,7 @@
  chmod a+x $INITRD_TREE/linuxrc
  chmod a+x $INITRD_TREE/cleanup
  
-@@ -103,46 +104,118 @@
+@@ -103,46 +98,112 @@
  ln -s busybox $INITRD_TREE/bin/poweroff
  ln -s busybox $INITRD_TREE/bin/halt
  ln -s busybox $INITRD_TREE/bin/reboot
@@ -173,6 +194,7 @@
  ln -s busybox $INITRD_TREE/bin/cat
 -ln -s busybox $INITRD_TREE/bin/grep
 -ln -s busybox $INITRD_TREE/bin/sleep
+-ln -s bin $INITRD_TREE/sbin
 +ln -s busybox $INITRD_TREE/bin/mkdir
 +ln -s busybox $INITRD_TREE/bin/echo
 +ln -s busybox $INITRD_TREE/bin/uname
@@ -199,7 +221,7 @@
 +#cp -a /bin/uname $INITRD_TREE/bin
 +#cp -a /bin/cp $INITRD_TREE/bin
 +#cp -a /bin/mv $INITRD_TREE/bin
- ln -s bin $INITRD_TREE/sbin
++#ln -s bin $INITRD_TREE/sbin
 +mkdir -p $INITRD_TREE/usr/share
 +cp -a /usr/bin/pcidev $INITRD_TREE/bin
 +cp -a /usr/share/pci-database $INITRD_TREE/usr/share
@@ -227,16 +249,12 @@
  
  LMK="lib/modules/$KERNEL"
  
- #necessary modules and dependency files
- mkdir -p $INITRD_TREE/$LMK/kernel/fs
+-#necessary modules and dependency files
+-mkdir -p $INITRD_TREE/$LMK/kernel/fs
 -cp kernel-modules/$KERNEL/unionfs.ko* $INITRD_TREE/$LMK/kernel/fs
 -cp kernel-modules/$KERNEL/squashfs.ko* $INITRD_TREE/$LMK/kernel/fs
-+#cp kernel-modules/$KERNEL/*.ko* $INITRD_TREE/$LMK/kernel/fs
-+#cp kernel-modules/$KERNEL/squashfs.ko* $INITRD_TREE/$LMK/kernel/fs
-+#cp kernel-modules/$KERNEL/zlib_inflate.ko* $INITRD_TREE/$LMK/kernel/fs
- 
-+(
- #copy filesystem modules, if not directly copied into kernel
+-
+-#copy filesystem modules, if not directly copied into kernel
 -rcopy_ex /$LMK/kernel/lib/zlib_inflate $INITRD_TREE 2>>$DEBUG
 -rcopy_ex /$LMK/kernel/lib/zlib_deflate $INITRD_TREE 2>>$DEBUG
 -rcopy_ex /$LMK/kernel/drivers/block/loop* $INITRD_TREE 2>>$DEBUG
@@ -247,6 +265,8 @@
 -rcopy_ex /$LMK/kernel/fs/ntfs $INITRD_TREE 2>>$DEBUG
 -rcopy_ex /$LMK/kernel/fs/ext3 $INITRD_TREE 2>>$DEBUG
 -rcopy_ex /$LMK/kernel/fs/reiserfs $INITRD_TREE 2>>$DEBUG
++(
++# copy filesystem modules, if not directly copied into kernel
 +rcopy $ROOT/$LMK/kernel/lib/zlib_inflate $INITRD_TREE $ROOT
 +rcopy $ROOT/$LMK/kernel/lib/zlib_deflate $INITRD_TREE $ROOT
 +rcopy $ROOT/$LMK/kernel/drivers/block/loop.ko* $INITRD_TREE $ROOT
@@ -264,15 +284,17 @@
  
  # add language support for filesystems
 -rcopy_ex /$LMK/kernel/fs/nls/ $INITRD_TREE 2>>$DEBUG
-+rcopy $ROOT/$LMK/kernel/fs/nls/nls_cp437.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/nls/nls_iso8859-1.ko* $INITRD_TREE $ROOT
-+rcopy $ROOT/$LMK/kernel/fs/nls/nls_iso8859-2.ko* $INITRD_TREE $ROOT
- 
- #usb modules
+-
+-#usb modules
 -rcopy_ex /$LMK/kernel/drivers/usb/storage $INITRD_TREE 2>>$DEBUG
 -rcopy_ex /$LMK/kernel/drivers/usb/host/ehci-hcd* $INITRD_TREE 2>>$DEBUG
 -rcopy_ex /$LMK/kernel/drivers/usb/host/ohci-hcd* $INITRD_TREE 2>>$DEBUG
 -rcopy_ex /$LMK/kernel/drivers/usb/host/uhci-hcd* $INITRD_TREE 2>>$DEBUG
++rcopy $ROOT/$LMK/kernel/fs/nls/nls_cp437.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/nls/nls_iso8859-1.ko* $INITRD_TREE $ROOT
++rcopy $ROOT/$LMK/kernel/fs/nls/nls_iso8859-2.ko* $INITRD_TREE $ROOT
++
++# usb modules
 +rcopy $ROOT/$LMK/kernel/drivers/usb/core/usbcore.ko* $INITRD_TREE $ROOT
 +rcopy $ROOT/$LMK/kernel/drivers/usb/input/usbhid.ko* $INITRD_TREE $ROOT
 +rcopy $ROOT/$LMK/kernel/drivers/usb/storage $INITRD_TREE $ROOT
@@ -295,7 +317,8 @@
 +rcopy $ROOT/$LMK/kernel/fs/unionfs.ko* $INITRD_TREE $ROOT
 +rcopy $ROOT/$LMK/kernel/fs/unionfs/unionfs $INITRD_TREE $ROOT
  
- #disk (scsi, ide, raid, pcmcia) modules
+-#disk (scsi, ide, raid, pcmcia) modules
++# disk (scsi, ide, raid, pcmcia) modules
  #rcopy_ex /$LMK/kernel/drivers/scsi $INITRD_TREE
  #rcopy_ex /$LMK/kernel/drivers/ide $INITRD_TREE
  #rcopy_ex /$LMK/kernel/drivers/pcmcia $INITRD_TREE
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-live-package.patch?r1=1.5&r2=1.6&f=u

More information about the pld-cvs-commit mailing list