diff options
| -rw-r--r-- | boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm | 1 | ||||
| -rw-r--r-- | boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm | 4 | ||||
| -rw-r--r-- | boot-env/syslinux/isolinux.bin | bin | 14336 -> 14336 bytes | |||
| -rwxr-xr-x | boot-env/syslinux/mboot.c32 | bin | 31148 -> 30380 bytes | |||
| -rwxr-xr-x | boot-env/syslinux/menu.c32 | bin | 57140 -> 54836 bytes | |||
| -rw-r--r-- | boot-env/syslinux/pxelinux.0 | bin | 16138 -> 16662 bytes | |||
| -rwxr-xr-x | boot-env/syslinux/syslinux | bin | 25604 -> 25472 bytes | |||
| -rwxr-xr-x | boot-env/syslinux/vesamenu.c32 | bin | 147728 -> 147996 bytes | |||
| -rw-r--r-- | initramfs/distro-specs/suse/functions-default | 2 | ||||
| -rw-r--r-- | installer/OpenSLX/OSExport/Distro/Ubuntu.pm | 2 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Distro/Base.pm | 4 |
11 files changed, 11 insertions, 2 deletions
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm b/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm index c664c1ba..1628c5f1 100644 --- a/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm +++ b/boot-env/OpenSLX/MakeInitRamFS/Distro/Suse.pm @@ -52,6 +52,7 @@ sub determineMatchingHwinfoVersion '10.3' => '14.19', '11.0' => '15.3', '11.1' => '15.21', + '11.2' => '15.21' ); return $versionMap{$distroVersion} || $self->SUPER::determineMatchingHwinfoVersion($distroVersion); diff --git a/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm b/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm index 9240f5b5..64c20538 100644 --- a/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm +++ b/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2006..2009 - OpenSLX GmbH + # Copyright (c) 2006..2009 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -54,6 +54,8 @@ sub determineMatchingHwinfoVersion '8.04' => '15.3', '8.10' => '15.21', '9.04' => '15.21', + '9.10' => '15.21', + '10.04' => '15.21', ); return $versionMap{$distroVersion} || $self->SUPER::determineMatchingHwinfoVersion($distroVersion); diff --git a/boot-env/syslinux/isolinux.bin b/boot-env/syslinux/isolinux.bin Binary files differindex 80f71c98..bd778b3b 100644 --- a/boot-env/syslinux/isolinux.bin +++ b/boot-env/syslinux/isolinux.bin diff --git a/boot-env/syslinux/mboot.c32 b/boot-env/syslinux/mboot.c32 Binary files differindex dfff3789..929ade6f 100755 --- a/boot-env/syslinux/mboot.c32 +++ b/boot-env/syslinux/mboot.c32 diff --git a/boot-env/syslinux/menu.c32 b/boot-env/syslinux/menu.c32 Binary files differindex 9413ec46..67f9c29b 100755 --- a/boot-env/syslinux/menu.c32 +++ b/boot-env/syslinux/menu.c32 diff --git a/boot-env/syslinux/pxelinux.0 b/boot-env/syslinux/pxelinux.0 Binary files differindex 743948e3..0df4fbed 100644 --- a/boot-env/syslinux/pxelinux.0 +++ b/boot-env/syslinux/pxelinux.0 diff --git a/boot-env/syslinux/syslinux b/boot-env/syslinux/syslinux Binary files differindex dd0319cf..92b1b907 100755 --- a/boot-env/syslinux/syslinux +++ b/boot-env/syslinux/syslinux diff --git a/boot-env/syslinux/vesamenu.c32 b/boot-env/syslinux/vesamenu.c32 Binary files differindex d9884770..804e2fb8 100755 --- a/boot-env/syslinux/vesamenu.c32 +++ b/boot-env/syslinux/vesamenu.c32 diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index cb281f65..b53227fc 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -548,6 +548,8 @@ if [ -e /mnt/etc/sysconfig/autofs ] ; then -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \ -i /mnt/etc/sysconfig/autofs rllinker "autofs" 18 4 + # might be needed for autofs via NFS (start specific nfs related services) + # echo 'NFS_START_SERVICES="no"' >>/mnt/etc/sysconfig/nfs else error "$df_erramt" nonfatal fi diff --git a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm index aff03cf3..ef844d51 100644 --- a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm +++ b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm @@ -41,6 +41,8 @@ sub initDistroInfo - /var/spool/* - /var/run/* - /var/log/* + - /var/log/apt/* + + /var/log/apt - /var/lib/*dm/* - /var/lib/libnss-ldap/* - /var/cache/apt/archives/* diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm index 99bae53f..589c3f34 100644 --- a/installer/OpenSLX/OSSetup/Distro/Base.pm +++ b/installer/OpenSLX/OSSetup/Distro/Base.pm @@ -72,7 +72,8 @@ sub initialize - /var/cache/apt/archives/lock - /var/cache/apt/archives/partial/* + /var/cache/apt/archives/partial - - /var/tmp/* + - /var/tmp/* + + /var/tmp/apt - /var/opt/openslx - /var/lib/vmware - /var/lib/ntp/* @@ -117,6 +118,7 @@ sub initialize + /bin - /* - .svn + - .git - .*.cmd - *~ - *lost+found* |