diff options
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/OpenSLX/OSExport/Distro/Ubuntu.pm | 2 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Distro/Base.pm | 10 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 17 |
3 files changed, 21 insertions, 8 deletions
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..f3fe05ab 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/* @@ -101,14 +102,16 @@ sub initialize + /lib - /home/* + /home - - /etc/vmware/installer.sh + - /etc/vmware/* + + /etc/vmware + - /etc/vmware-installer - /etc/grub* - /etc/shadow* - /etc/samba/secrets.tdb - /etc/resolv.conf.* - /etc/opt/openslx - /etc/exports* - - /etc/X11/xorg.c* + - /etc/X11/xorg.* - /etc/X11/XF86* + /etc - /dev/* @@ -117,6 +120,7 @@ sub initialize + /bin - /* - .svn + - .git - .*.cmd - *~ - *lost+found* diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index 911fc543..72e8c7e8 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2006..2009 - OpenSLX GmbH +# Copyright (c) 2006..2010 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -56,6 +56,8 @@ use vars qw(%supportedDistros); 'suse-11.0_x86_64' => 'clone,update,shell', 'suse-11.1' => 'clone,install,update,shell', 'suse-11.1_x86_64' => 'clone,update,shell', + 'suse-11.2' => 'clone,install,update,shell', + 'suse-11.2_x86_64' => 'clone,update,shell', 'scilin-4.7' => 'clone,update,shell', 'scilin-5.3' => 'clone,update,shell', 'ubuntu-8.04' => 'clone,install,update,shell', @@ -66,6 +68,8 @@ use vars qw(%supportedDistros); 'ubuntu-9.04_amd64' => 'clone,update,shell', 'ubuntu-9.10' => 'clone,install,update,shell', 'ubuntu-9.10_amd64' => 'clone,update,shell', + 'ubuntu-10.04' => 'clone,install,update,shell', + 'ubuntu-10.04_amd64'=> 'clone,update,shell', ); my %localHttpServers; @@ -1102,8 +1106,9 @@ sub _generateDefaultDirs my $OPENSLX_DEFAULT_DIR = "/opt/openslx"; my $OPENSLX_DEFAULT_CONFDIR = "/etc/opt/openslx"; my $OPENSLX_DEFAULT_LOGDIR = "/var/log/openslx"; - my $OPENSLX_DEFAULT_BINDIR = "/var/opt/openslx/bin"; - my $OPENSLX_DEFAULT_LIBDIR = "/var/opt/openslx/lib"; + my $OPENSLX_DEFAULT_VARDIR = "/var/opt/openslx"; + my $OPENSLX_DEFAULT_BINDIR = "$OPENSLX_DEFAULT_VARDIR/bin"; + my $OPENSLX_DEFAULT_LIBDIR = "$OPENSLX_DEFAULT_VARDIR/lib"; my $OPENSLX_DEFAULT_VIRTDIR = "/var/lib/virt"; mkpath("$targetRoot/$OPENSLX_DEFAULT_DIR", "$targetRoot/$OPENSLX_DEFAULT_CONFDIR", @@ -1113,9 +1118,12 @@ sub _generateDefaultDirs "$targetRoot/$OPENSLX_DEFAULT_VIRTDIR"); slxsystem("chmod 1777 $targetRoot/$OPENSLX_DEFAULT_LOGDIR"); - my $openslxConfig = "OPENSLX_DEFAULT_DIR=$OPENSLX_DEFAULT_DIR\n"; + my $openslxConfig = "# Default OpenSLX directories defined by satge 1\n"; + $openslxConfig .= "# Version 0.2\n\n"; + $openslxConfig .= "OPENSLX_DEFAULT_DIR=$OPENSLX_DEFAULT_DIR\n"; $openslxConfig .= "OPENSLX_DEFAULT_CONFDIR=$OPENSLX_DEFAULT_CONFDIR\n"; $openslxConfig .= "OPENSLX_DEFAULT_LOGDIR=$OPENSLX_DEFAULT_LOGDIR\n"; + $openslxConfig .= "OPENSLX_DEFAULT_VARDIR=$OPENSLX_DEFAULT_VARDIR\n"; $openslxConfig .= "OPENSLX_DEFAULT_BINDIR=$OPENSLX_DEFAULT_BINDIR\n"; $openslxConfig .= "OPENSLX_DEFAULT_LIBDIR=$OPENSLX_DEFAULT_LIBDIR\n"; $openslxConfig .= "OPENSLX_DEFAULT_VIRTDIR=$OPENSLX_DEFAULT_VIRTDIR\n"; @@ -1151,7 +1159,6 @@ sub _copyUclibcRootfs kexec libcurses.so* libncurses.so* - mconf strace ); my $exclOpts = join ' ', map { "--exclude $_" } @excludes; |