diff options
| author | Dirk von Suchodoletz | 2006-03-30 22:10:13 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-03-30 22:10:13 +0200 |
| commit | 8cd82995c9c01fac59aa5ff6ef17a098d73db5d9 (patch) | |
| tree | d59261674adccf0ee39016be3fef556463708dba /installer | |
| parent | New functionality for retrieving the frequency ranges of the monitor from ddc... (diff) | |
| download | core-8cd82995c9c01fac59aa5ff6ef17a098d73db5d9.tar.gz core-8cd82995c9c01fac59aa5ff6ef17a098d73db5d9.tar.xz core-8cd82995c9c01fac59aa5ff6ef17a098d73db5d9.zip | |
more debug level, exclude-common for rsync (files and directories common
for all distros), ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@132 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/distro-specs/exclude-common | 29 | ||||
| -rw-r--r-- | installer/distro-specs/exclude-suse-10.1 | 29 | ||||
| -rwxr-xr-x | installer/ld4-inst | 10 |
3 files changed, 37 insertions, 31 deletions
diff --git a/installer/distro-specs/exclude-common b/installer/distro-specs/exclude-common new file mode 100644 index 00000000..9fffa442 --- /dev/null +++ b/installer/distro-specs/exclude-common @@ -0,0 +1,29 @@ ++ /bin ++ /boot ++ /dev ++ /etc ++ /home ++ /lib ++ /lib64 ++ /mnt ++ /opt ++ /proc ++ /root ++ /sbin ++ /sys ++ /tmp ++ /usr ++ /var +- /etc/shadow* +- /dev/* +- /proc/* +- /sys/* +- /tmp/* +- /root/* +- /home/* +- /mnt/* +- /* +- .svn +- *~ +- *lost+found* + diff --git a/installer/distro-specs/exclude-suse-10.1 b/installer/distro-specs/exclude-suse-10.1 index 7e49a641..17152259 100644 --- a/installer/distro-specs/exclude-suse-10.1 +++ b/installer/distro-specs/exclude-suse-10.1 @@ -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,6 @@ - /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 +17,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/profile_chooser-autostart.desktop +- /opt/kde3/share/autostart/knetworkmanager-autostart.desktop diff --git a/installer/ld4-inst b/installer/ld4-inst index 4407a708..9bb4c6c3 100755 --- a/installer/ld4-inst +++ b/installer/ld4-inst @@ -3,8 +3,8 @@ # Description: Script for generating dxs filesystem by # cloning from rsync source for Diskless X Stations (v4.0) # -# Author(s): Nico Dietrich -# Dirk von Suchodoletz <dirk@goe.net>, 02-11-2005 +# Author(s): Nico Dietrich, 22-03-2006 +# Dirk von Suchodoletz <dirk@goe.net>, 30-03-2006 # # Copyright: (c) 2003, 2005 - RZ Universitaet Freiburg # @@ -208,7 +208,9 @@ configure() { copy_system() { echo -e "\n\nSyncing system now\nPlease enter root password of client machine\n" - rsync -avDe ssh --delete --exclude-from=distro-specs/exclude-${client_distro}-${client_distro_ver} ${rsyncsource} ${rootdir} || { echo "Rsync failed" ; exit 1 ; } + 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 ; } # generate error message in case rsync didn't work and exit. @@ -302,7 +304,7 @@ setup_server () { current_initrd=${tftpbootdir}/initrd-dxs-${current_kernel} if [ $j -eq 0 ] ; then - default_string=" MENU DEFAULT\n" + default_string="\tMENU DEFAULT\n" else default_string="" fi |