diff options
author | Karsten Behrmann | 2006-03-04 19:19:34 +0000 |
---|---|---|
committer | Karsten Behrmann | 2006-03-04 19:19:34 +0000 |
commit | bfb2a0ca0d6b56fa17d7a41da672f22879e2064c (patch) | |
tree | e0a074ba408b829600c4dc8d4563ba64b87a8998 | |
parent | d2c4a9ad6e083232817fdd94037331853a43f5ff (diff) |
Fix two bugs, preparing for -rc2stable-0.9.6
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | iso/skeleton/usr/share/smgl.install/modules/bootloader | 1 | ||||
-rwxr-xr-x | iso/skeleton/usr/share/smgl.install/modules/diskStructure | 8 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,7 @@ +2006-03-04 Karsten Behrmann <BearPerson@sourcemage.org> + * bootloader: also run mkofboot on ppc + * diskStructure: make sure fstab includes swapfile + 2006-01-31 Karsten Behrmann <BearPerson@sourcemage.org> * generation-scripts/config: bump to 0.9.6 diff --git a/iso/skeleton/usr/share/smgl.install/modules/bootloader b/iso/skeleton/usr/share/smgl.install/modules/bootloader index 60b9870..362b6ac 100755 --- a/iso/skeleton/usr/share/smgl.install/modules/bootloader +++ b/iso/skeleton/usr/share/smgl.install/modules/bootloader @@ -241,6 +241,7 @@ bl_yaboot_install() { # we use --nonvram since we don't have nvsetenv installed + try_run -e "creating the bootstrap partition" chroot_cmd mkofboot try_run -e "installing yaboot" chroot_cmd ybin --nonvram debug_enter "bootloader" 2 diff --git a/iso/skeleton/usr/share/smgl.install/modules/diskStructure b/iso/skeleton/usr/share/smgl.install/modules/diskStructure index 29846f5..8efcd39 100755 --- a/iso/skeleton/usr/share/smgl.install/modules/diskStructure +++ b/iso/skeleton/usr/share/smgl.install/modules/diskStructure @@ -57,10 +57,6 @@ non-xfs /boot partition." ;; D) if need_dependency disk-root; then - rm -f $FINALFILES/etc/fstab - cat $TEMPLATE_DIR/fstab.first /tmp/fstab $TEMPLATE_DIR/fstab.last \ - >$FINALFILES/etc/fstab - fill_dependency disk DONE=true fi ;; @@ -74,6 +70,10 @@ You have no dedicated swap partition."; then mk_swap_file fi fi + rm -f $FINALFILES/etc/fstab + cat $TEMPLATE_DIR/fstab.first /tmp/fstab $TEMPLATE_DIR/fstab.last \ + >$FINALFILES/etc/fstab + fill_dependency disk return 0 # When we've reached this point, always return success. |