[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

kadischi/livecd_generator install-boot.sh, 1.16, 1.17 livecd-mkinitrd.sh, 1.35, 1.36



Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9780/kadischi/livecd_generator

Modified Files:
	install-boot.sh livecd-mkinitrd.sh 
Log Message:
Use NASH exclusively, remove Busybox


Index: install-boot.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- install-boot.sh	16 Apr 2007 23:12:32 -0000	1.16
+++ install-boot.sh	16 May 2007 00:44:56 -0000	1.17
@@ -10,7 +10,7 @@
 kernel_is_smp=$(echo $kernel | /bin/grep -G [[:alnum:]]smp)
 kernel_is_up=$(echo $kernel | grep -v smp)
 kernel_version_proper=$(echo $kernel | /bin/sed -e 's|xen0||' | /bin/sed -e 's|xenU||' | /bin/sed -e 's|xen||')
-kernel_params='selinux=0'
+kernel_params='selinux=0 init=/etc/rc.readonly linuxrc'
 
  . /etc/kadischi/kadischi.conf
 


Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- livecd-mkinitrd.sh	4 May 2007 16:38:56 -0000	1.35
+++ livecd-mkinitrd.sh	16 May 2007 00:44:56 -0000	1.36
@@ -234,13 +234,22 @@
         /bin/ln -s "/lib/libm.so.6" "$MNTIMAGE/usr/lib/libm.so"
     fi
 
-    if [ -f $rootdir/lib/libcrypt.so.1 ]; then
-        inst $rootdir/lib/libcrypt.so.1 "$MNTIMAGE/lib/libcrypt.so.1"
-    fi
- 
-    if [ -f $rootdir/usr/lib/libz.so.1 ]; then
-        inst $rootdir/usr/lib/libz.so.1 "$MNTIMAGE/usr/lib/libz.so.1"
-    fi
+    inst $rootdir/lib/libcrypt.so.1 "$MNTIMAGE/lib/libcrypt.so.1"
+    inst $rootdir/lib/libz.so.1 "$MNTIMAGE/lib/libz.so.1"
+    inst $rootdir/usr/lib/libnash.so.6.0.9 "$MNTIMAGE/usr/lib/libnash.so.6.0.9"
+    inst $rootdir/usr/lib/libbdevid.so.6.0.9 "$MNTIMAGE/usr/lib/libbdevid.so.6.0.9"
+    inst $rootdir/lib/libdevmapper.so.1.02 "$MNTIMAGE/lib/libdevmapper.so.1.02"
+    inst $rootdir/usr/lib/libparted-1.8.so.6 "$MNTIMAGE/usr/lib/libparted-1.8.so.6"
+    inst $rootdir/lib/libblkid.so.1 "$MNTIMAGE/lib/libblkid.so.1"
+    inst $rootdir/lib/libuuid.so.1 "$MNTIMAGE/lib/libuuid.so.1"
+    inst $rootdir/usr/lib/libpopt.so.0 "$MNTIMAGE/usr/lib/libpopt.so.0"
+    inst $rootdir/lib/libresolv.so.2 "$MNTIMAGE/lib/libresolv.so.2"
+    inst $rootdir/usr/lib/libdhcp.so.1 "$MNTIMAGE/usr/lib/libdhcp.so.1"
+    inst $rootdir/usr/lib/libnl.so.1 "$MNTIMAGE/usr/lib/libnl.so.1"
+    inst $rootdir/usr/lib/libdhcp4client-3.0.5.so.0 "$MNTIMAGE/usr/lib/libdhcp4client-3.0.5.so.0"
+    inst $rootdir/usr/lib/libdhcp6client-0.10.so.0 "$MNTIMAGE/usr/lib/libdhcp6client-0.10.so.0"
+    inst $rootdir/lib/libglib-2.0.so.0 "$MNTIMAGE/lib/libglib-2.0.so.0"
+    inst $rootdir/lib/libcrypto.so.6 "$MNTIMAGE/lib/libcrypto.so.6"
 else
     inst $rootdir/lib64/ld-linux-x86-64.so.2 "$MNTIMAGE/lib64/ld-linux-x86-64.so.2"
     inst $rootdir/lib64/libselinux.so.1 "$MNTIMAGE/lib64/libselinux.so.1"
@@ -260,22 +269,30 @@
         /bin/ln -s "/lib64/libm.so.6" "$MNTIMAGE/usr/lib/libm.so"
     fi
 
-    if [ -f $rootdir/lib64/libcrypt.so.1 ]; then
-        inst $rootdir/lib64/libcrypt.so.1 "$MNTIMAGE/lib64/libcrypt.so.1"
-    fi
-   
-    if [ -f $rootdir/usr/lib64/libz.so.1 ]; then
-        inst $rootdir/usr/lib64/libz.so.1 "$MNTIMAGE/usr/lib64/libz.so.1"
-    fi
+    inst $rootdir/lib64/libcrypt.so.1 "$MNTIMAGE/lib64/libcrypt.so.1"
+    inst $rootdir/lib64/libz.so.1 "$MNTIMAGE/lib64/libz.so.1"
+    inst $rootdir/usr/lib64/libnash.so.6.0.9 "$MNTIMAGE/usr/lib64/libnash.so.6.0.9"
+    inst $rootdir/usr/lib64/libbdevid.so.6.0.9 "$MNTIMAGE/usr/lib64/libbdevid.so.6.0.9"
+    inst $rootdir/lib64/libdevmapper.so.1.02 "$MNTIMAGE/lib64/libdevmapper.so.1.02"
+    inst $rootdir/usr/lib64/libparted-1.8.so.6 "$MNTIMAGE/usr/lib64/libparted-1.8.so.6"
+    inst $rootdir/lib64/libblkid.so.1 "$MNTIMAGE/lib64/libblkid.so.1"
+    inst $rootdir/lib64/libuuid.so.1 "$MNTIMAGE/lib64/libuuid.so.1"
+    inst $rootdir/usr/lib64/libpopt.so.0 "$MNTIMAGE/usr/lib64/libpopt.so.0"
+    inst $rootdir/lib64/libresolv.so.2 "$MNTIMAGE/lib64/libresolv.so.2"
+    inst $rootdir/usr/lib64/libdhcp.so.1 "$MNTIMAGE/usr/lib64/libdhcp.so.1"
+    inst $rootdir/usr/lib64/libnl.so.1 "$MNTIMAGE/usr/lib64/libnl.so.1"
+    inst $rootdir/usr/lib64/libdhcp4client-3.0.5.so.0 "$MNTIMAGE/usr/lib64/libdhcp4client-3.0.5.so.0"
+    inst $rootdir/usr/lib64/libdhcp6client-0.10.so.0 "$MNTIMAGE/usr/lib64/libdhcp6client-0.10.so.0"
+    inst $rootdir/lib64/libglib-2.0.so.0 "$MNTIMAGE/lib64/libglib-2.0.so.0"
+    inst $rootdir/lib64/libcrypto.so.6 "$MNTIMAGE/lib64/libcrypto.so.6"
 fi
     
 
 # Install NASH
-inst /sbin/nash "$MNTIMAGE/bin/nash"
-# Install busybox
-inst /sbin/busybox.anaconda "$MNTIMAGE/bin/busybox"
+inst $rootdir/sbin/nash "$MNTIMAGE/bin/nash"
 
-inst $LIBEXECDIR/kadischi/find-live-cd "$MNTIMAGE/bin/find-live-cd"
+# Install find-live-cd LiveCD binary.
+inst $rootdir/usr/libexec/kadischi/find-live-cd "$MNTIMAGE/bin/find-live-cd"
 
 # Useful for debugging:
 # inst /usr/bin/strace "$MNTIMAGE/bin/strace"
@@ -295,7 +312,7 @@
 fi
 inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep"
 
-MODULES=$(findmodules fs/mbcache.ko drivers/ata drivers/parport drivers/block/loop.ko fs/jbd/jbd.ko fs/ext3/ext3.ko fs/squashfs drivers/cdrom/cdrom.ko drivers/ide/ide-cd.ko drivers/md/dm-mirror.ko drivers/md/dm-zero.ko drivers/md/dm-mod.ko drivers/md/dm-snapshot.ko drivers/usb/host drivers/usb/storage drivers/scsi fs/nls/nls_utf8.ko)
+MODULES=$(findmodules fs/mbcache.ko drivers/ata drivers/parport drivers/block/loop.ko fs/jbd/jbd.ko fs/ext3/ext3.ko fs/squashfs drivers/cdrom/cdrom.ko drivers/md/dm-mirror.ko drivers/md/dm-zero.ko drivers/md/dm-mod.ko drivers/md/dm-snapshot.ko drivers/usb/host drivers/usb/storage drivers/scsi fs/nls/nls_utf8.ko)
 for MODULE in $MODULES; do
     instmodule $MODULE
 done
@@ -315,6 +332,7 @@
     /bin/mknod $MNTIMAGE/dev/loop$i b 7 $i
 done
 
+# Install initramfs init script
 inst $INSTALLDIR/initrd/livecd-linuxrc "$MNTIMAGE/linuxrc"
 
 (cd $MNTIMAGE; ln -s linuxrc init)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]