[Devil-linux-commit] build/scripts build-iso, 1.81, 1.82 create_etc, 1.16, 1.17

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv17116

Modified Files:
	build-iso create_etc 
Log Message:

- initial INITRAMFS support


Index: create_etc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/create_etc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- create_etc	8 Sep 2006 15:48:57 -0000	1.16
+++ create_etc	19 May 2008 12:37:20 -0000	1.17
@@ -33,6 +33,15 @@
 		cp -dpR $DL_DIR/config/etc/init.d/functions $INITRDDIR/ || exit 1
 		rm -rf $INITRDDIR/CVS 
 
+		if [ "$CONFIG_INITRD_FS" = "INITRAMFS" ]; then
+			echo " converting linuxrc to init... "
+			pushd $INITRDDIR/ > /dev/null || exit 1
+			patch -o init -p1 < $MYDIR/config/initrd_initramfs.linuxrc.diff || exit 1
+			chmod 755 ./init || exit 1
+			echo "done"
+			popd > /dev/null
+		fi
+
 		pushd $ETCDIR/etc > /dev/null
 
 		# add correct version numbers

Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- build-iso	1 May 2008 14:43:18 -0000	1.81
+++ build-iso	19 May 2008 12:37:20 -0000	1.82
@@ -174,6 +174,25 @@
 			echo
 		fi
 
+		#===========================================================================
+
+		if [ "$CONFIG_INITRD_FS" = "INITRAMFS" ]; then
+
+			echo "creating the initial ramfs (initramfs) image.... "
+
+			# store version
+			echo $DL_VERSION > $INITRDDIR/VERSION
+
+			pushd $INITRDDIR/  
+			find . | cpio -H newc -o | gzip -9 > $BOOTIMAGEDIR/initrd.gz
+			popd
+
+			echo "done"
+			echo
+		fi
+
+		#===========================================================================
+
 		if [ "$CONFIG_INITRD_FS" = "EXT2" ]; then
 
 			#===========================================================================
@@ -308,9 +327,12 @@
 		if [ "$CONFIG_INITRD_FS" = "EXT2" ]; then
 			BOOT_OPTION_RAMDISK="ro ramdisk_size=$ISIZE"
 		fi
-
+		if [ "$CONFIG_INITRD_FS" = "INITRAMFS" ]; then
+			BOOT_OPTIONS_DL="initrd=/boot/initrd.gz $BOOT_OPTION_RAMDISK"
+		else
+			BOOT_OPTIONS_DL="root=/dev/ram0 initrd=/boot/initrd.gz init=/linuxrc $BOOT_OPTION_RAMDISK"
+		fi
 		#original: DEFAULT /boot/vmlinuz root=/dev/ram1 initrd=/boot/initrd.gz [ro ramdisk=$ISIZE][ramdisk_blocksize=4096]
-		BOOT_OPTIONS_DL="root=/dev/ram0 initrd=/boot/initrd.gz init=/linuxrc $BOOT_OPTION_RAMDISK"
 		cat > $CDDIR/isolinux.cfg <<-EOF
 		default $BOOT_OPTION_DEFAULT
 		display /boot/message