extensions within the installer for mksquashfs, integration of cowloop

(special network block device module)


git-svn-id: http://svn.openslx.org/svn/openslx/ld4@136 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 32 insertions, 32 deletions

diff --git a/installer/distro-specs/exclude-common b/installer/distro-specs/exclude-common
index 9fffa442..3138e283 100644
--- a/installer/distro-specs/exclude-common
+++ b/installer/distro-specs/exclude-common
@@ -26,4 +26,3 @@
 - .svn
 - *~
 - *lost+found*
-
diff --git a/installer/distro-specs/exclude-suse-10.0 b/installer/distro-specs/exclude-suse-10.0
index 7e49a641..b555d99b 100644
--- a/installer/distro-specs/exclude-suse-10.0
+++ b/installer/distro-specs/exclude-suse-10.0
@@ -1,22 +1,4 @@
-+ /bin
-+ /boot
-+ /dev
-+ /etc
-+ /home
-+ /lib
-+ /lib64
 + /media
-+ /mnt
-+ /opt
-+ /proc
-+ /root
-+ /sbin
-+ /sys
-+ /tmp
-+ /usr
-+ /var
-- .svn
-- *~
 - *.rpmsave
 - *.rpmnew
 - *.YaST2save
@@ -25,13 +7,7 @@
 - /lib/klibc/events/*
 - /boot/initrd*
 - /boot/grub
-- /dev/*
 - /etc/shadow*
-- /proc/*
-- /sys/*
-- /tmp/*
-- /root/*
-- /home/*
 - /var/cache/man/*
 - /var/lib/YaST2/you/mnt/*
 - /var/lib/hardware/*
@@ -42,8 +18,8 @@
 - /var/lib/xdm
 - /usr/share/vmware/*
 - *lost+found*
-- /mnt/*
 - /media/*
 - /opt/kde3/share/autostart/SUSEgreeter.desktop
 - /opt/kde3/share/autostart/suseplugger.desktop
-- /*
+- /opt/kde3/share/autostart/susewatcher.desktop
+- /opt/kde3/share/autostart/profile_chooser-autostart.desktop
diff --git a/installer/ld4-inst b/installer/ld4-inst
index 9bb4c6c3..0a354501 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -173,7 +173,7 @@ configure() {
 
   ask "Path for client system: " rootdir $rootdir
   ask "Path for tftpboot: " tftpbootdir $tftpbootdir
-  ask "Which network do you want to use for DXS? (A.B.C.0) " netname $netname
+  ask "Which network do you want to use for DXS? (A.B.C.0): " netname $netname
   ask "Which netmask should be used? (255.B.C.0): " netmask $netmask
   ask "What is your servers IP for NFS, DHCP and TFTP? " server $server
   # noetig??
@@ -198,7 +198,9 @@ configure() {
   # list available kernels and allow to chose from
 
   # nfs / nbd / squash-fs?
-
+  ask "Would you like to use NBD? (y/N): " nbdyes $nbdyes
+  ask "Which kind of NBD export (ext2/squashfs)?: " nbdfs $nbdfs 
+  
 
   # password for pxeboot-menu (caution: you can easily retrieve it in clear
   # text!!)
@@ -207,14 +209,37 @@ configure() {
 
 
 copy_system() {
+  # allow generic (identical over different versions) or specific exclude
+  # files
+  if [ -e distro-specs/exclude-${client_distro}-${client_distro_ver} ] ; then
+    local excludefile="distro-specs/exclude-${client_distro}-${client_distro_ver}"
+  else
+    local excludefile="distro-specs/exclude-${client_distro}"
+  fi
+  echo $excludefile
   echo -e "\n\nSyncing system now\nPlease enter root password of client machine\n"
   rsync -avDe ssh --delete --exclude-from=distro-specs/exclude-common \
-    --exclude-from=distro-specs/exclude-${client_distro}-${client_distro_ver} \
-    ${rsyncsource} ${rootdir} || { echo "Rsync failed" ; exit 1 ; }
+    --exclude-from=${excludefile} ${rsyncsource} ${rootdir} || \
+    { echo "Rsync failed" ; exit 1 ; }
 
   # generate error message in case rsync didn't work and exit.
 
-  # TODO: mksquashfs (background process)   
+}
+
+create_nbd() {
+  if [ "$nbdyes" = "yes" -o "$nbdyes" = "y" -o "$nbdyes" = "Y" ] ; then
+    # TODO: mksquashfs (background process)
+    if [ "$nbdfs" = "squashfs" ] ; then
+      echo -e "\nGenerating "
+      if `which mksquashfs` ; then
+        mksquashfs ${rootdir} ${rootdir}.squashfs &
+      else
+        echo -e "Tool 'mksquashfs' not found, skipping"
+      fi
+    else
+      echo -e "\nGenerating "
+    fi
+  fi
 }
 
 create_initrd() {