diff options
| author | Oliver Tappe | 2007-12-30 18:52:18 +0100 |
|---|---|---|
| committer | Oliver Tappe | 2007-12-30 18:52:18 +0100 |
| commit | b681bcf8ed09029520958106365fd61be8faf24f (patch) | |
| tree | ee9d8e8b1cb810a2366fca180aef08dd15203a6d /installer/OpenSLX/OSSetup/Distro | |
| parent | * completed test set for attribute merging, fixing several bugs along the (diff) | |
| download | core-b681bcf8ed09029520958106365fd61be8faf24f.tar.gz core-b681bcf8ed09029520958106365fd61be8faf24f.tar.xz core-b681bcf8ed09029520958106365fd61be8faf24f.zip | |
cleaned up installation code in several ways:
* Removed some inconsistencies with respect to the separation of prereq-
and bootstrap-packages, such that now all packages are being installed
properly into the final system (the prereq packages have to installed
twice for this).
Before, the prereq packages were being installed without their scripts
ever being run. While I haven't noticed a specific bug caused by this,
the mere possibility seemed a good enough cause to change this.
* added a default /etc/hosts file to all distros, as otherwise the lookup
of localhost is flaky (at best)
* fixed a multiple inclusion bug when expanding the packages of a selection
* improved and clarified structure of selections:
+ now there is always a 'minimal' selection, on which most others are based
+ the default selection is now merely a different name for some other
selection (currently, minimal or textmode, later this should probably be
gnome or kde).
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1438 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer/OpenSLX/OSSetup/Distro')
| -rw-r--r-- | installer/OpenSLX/OSSetup/Distro/Debian.pm | 5 | ||||
| -rw-r--r-- | installer/OpenSLX/OSSetup/Distro/Ubuntu.pm | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/installer/OpenSLX/OSSetup/Distro/Debian.pm b/installer/OpenSLX/OSSetup/Distro/Debian.pm index e430abd4..a514f10f 100644 --- a/installer/OpenSLX/OSSetup/Distro/Debian.pm +++ b/installer/OpenSLX/OSSetup/Distro/Debian.pm @@ -80,8 +80,9 @@ sub preSystemInstallationHook # replace /usr/sbin/invoke-rc.d by a dummy, in order to avoid a whole lot # of initscripts being started. Wishful thinking: there should be another - # way to stop Ubuntu from doing this, as this is not really very supportive - # of folder-based installations ... + # way to stop Debian from doing this, as this is not really very supportive + # of folder-based installations (then again: I may simply be too stupid + # to find out how it is supposed to work ...) rename('/usr/sbin/invoke-rc.d', '/usr/sbin/_invoke-rc.d'); spitFile('/usr/sbin/invoke-rc.d', "#! /bin/sh\nexit 0\n"); chmod 0755, '/usr/sbin/invoke-rc.d'; diff --git a/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm b/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm index 029c35c3..4ab5abbc 100644 --- a/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm +++ b/installer/OpenSLX/OSSetup/Distro/Ubuntu.pm @@ -81,7 +81,8 @@ sub preSystemInstallationHook # replace /usr/sbin/invoke-rc.d by a dummy, in order to avoid a whole lot # of initscripts being started. Wishful thinking: there should be another # way to stop Ubuntu from doing this, as this is not really very supportive - # of folder-based installations ... + # of folder-based installations (then again: I may simply be too stupid + # to find out how it is supposed to work ...) rename('/usr/sbin/invoke-rc.d', '/usr/sbin/_invoke-rc.d'); spitFile('/usr/sbin/invoke-rc.d', "#! /bin/sh\nexit 0\n"); chmod 0755, '/usr/sbin/invoke-rc.d'; |