diff options
author | Dirk von Suchodoletz | 2009-08-14 16:30:03 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2009-08-14 16:30:03 +0200 |
commit | 6609e15b974bf8593595a3485da6a18fa28579af (patch) | |
tree | b3f826899acfd88ff0e1cd75a460ccdba084c955 | |
parent | Initfile now created by DistroUtils (diff) | |
download | core-6609e15b974bf8593595a3485da6a18fa28579af.tar.gz core-6609e15b974bf8593595a3485da6a18fa28579af.tar.xz core-6609e15b974bf8593595a3485da6a18fa28579af.zip |
Some trivial stuff ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3091 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r-- | initramfs/distro-specs/ubuntu/functions-default | 6 | ||||
-rw-r--r-- | installer/OpenSLX/OSExport/Distro/Ubuntu.pm | 3 | ||||
-rw-r--r-- | installer/OpenSLX/OSSetup/Distro/Base.pm | 1 | ||||
-rw-r--r-- | installer/OpenSLX/OSSetup/Engine.pm | 1 | ||||
-rw-r--r-- | os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default index efb0abf1..4215920d 100644 --- a/initramfs/distro-specs/ubuntu/functions-default +++ b/initramfs/distro-specs/ubuntu/functions-default @@ -64,9 +64,9 @@ config_distro () { echo "# inittab is obsolete with the change to upstart from ubuntu 7.10" \ > /mnt/etc/inittab - # fix getty bug - # (console login on tty1 is started too early) - sed -i "s/start on runlevel 2/start on stopped rc2/" /mnt/etc/event.d/tty1 + # fix getty bug (console login on tty1 is started too early) + [ -f /mnt/etc/event.d/tty1 ] && \ + sed -i "s/start on runlevel 2/start on stopped rc2/" /mnt/etc/event.d/tty1 # for screen sessions testmkd /mnt/var/run/screen root:utmp 0775 diff --git a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm index 7b7f1091..aff03cf3 100644 --- a/installer/OpenSLX/OSExport/Distro/Ubuntu.pm +++ b/installer/OpenSLX/OSExport/Distro/Ubuntu.pm @@ -41,7 +41,8 @@ sub initDistroInfo - /var/spool/* - /var/run/* - /var/log/* - - /var/lib/xdm + - /var/lib/*dm/* + - /var/lib/libnss-ldap/* - /var/cache/apt/archives/* - /var/cache/man/* - /var/cache/nscd/* diff --git a/installer/OpenSLX/OSSetup/Distro/Base.pm b/installer/OpenSLX/OSSetup/Distro/Base.pm index 23a53243..fe56f03e 100644 --- a/installer/OpenSLX/OSSetup/Distro/Base.pm +++ b/installer/OpenSLX/OSSetup/Distro/Base.pm @@ -68,6 +68,7 @@ sub initialize ]; $self->{'clone-filter'} = " + - /var/cache/apt/archives/* - /var/tmp/* - /var/opt/openslx - /var/lib/vmware diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm index b5d833a9..c614c081 100644 --- a/installer/OpenSLX/OSSetup/Engine.pm +++ b/installer/OpenSLX/OSSetup/Engine.pm @@ -1096,6 +1096,7 @@ sub _copyUclibcRootfs close($rsyncFH) or die _tr("unable to copy to target '%s', giving up! (%s)", $target, $!); + # add the uclibs to the ld.so.conf # write version of uclibc-rootfs original into a file in order to be # able to check the up-to-date state later (in the config-demuxer) diff --git a/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm b/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm index fd4c827f..e936590e 100644 --- a/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm +++ b/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm @@ -158,7 +158,7 @@ sub _writeRunlevelScript my $initfile = newInitFile(); - $initfile->setName("virtualbox.slx"); + $initfile->setName("vbox-slx"); $initfile->setDesc("Setup environment for virtualbox. Part of OpenSLX virtualbox plugin."); # todo: Function need to be formated proper... not important right now |