diff options
| author | Matt Housh <jaeger@crux.nu> | 2014-04-27 14:50:43 -0500 |
|---|---|---|
| committer | Matt Housh <jaeger@crux.nu> | 2014-04-27 14:50:43 -0500 |
| commit | b98594bdc441c49fc0c26493bfb3382799a619d1 (patch) | |
| tree | 3734115389e7ad91b78df9df14e0f0120894af2a /iso | |
| parent | e5e7929ed6eb19b52bde08935f70ee6224e82100 (diff) | |
| download | iso-b98594bdc441c49fc0c26493bfb3382799a619d1.tar.gz iso-b98594bdc441c49fc0c26493bfb3382799a619d1.tar.xz | |
Updated kernel, boot tweaks, xorg package list, added man-db to setup-helper
Diffstat (limited to 'iso')
| -rwxr-xr-x | iso/bin/setup-helper | 5 | ||||
| -rw-r--r-- | iso/grub-early.cfg | 2 | ||||
| -rw-r--r-- | iso/grub.cfg | 2 | ||||
| -rw-r--r-- | iso/isolinux/boot.msg | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/iso/bin/setup-helper b/iso/bin/setup-helper index 5d0c898..82cdf5a 100755 --- a/iso/bin/setup-helper +++ b/iso/bin/setup-helper @@ -101,6 +101,11 @@ if [ `is_installed btrfs-progs` ]; then inject_packages lzo fi +if [ `is_installed man` ]; then + remove_packages man + inject_packages libpipeline man-db +fi + if [ `is_installed libjpeg` ]; then remove_packages libjpeg inject_packages libjpeg-turbo diff --git a/iso/grub-early.cfg b/iso/grub-early.cfg index 1067802..53177ec 100644 --- a/iso/grub-early.cfg +++ b/iso/grub-early.cfg @@ -1,2 +1,2 @@ search --file --no-floppy --set root /crux-media -configfile /boot/grub/grub.cfg +set prefix=($root)/boot/grub diff --git a/iso/grub.cfg b/iso/grub.cfg index c7678bd..1db91b9 100644 --- a/iso/grub.cfg +++ b/iso/grub.cfg @@ -7,7 +7,7 @@ set menu_color_highlight=light-blue/white search --file --no-floppy --set root /crux-media set prefix=($root)/boot/grub -menuentry "CRUX 3.0 Installation Media (UEFI)" { +menuentry "Install/Upgrade CRUX 3.1 (UEFI mode)" { insmod efi_uga insmod efi_gop set gfxmode=auto diff --git a/iso/isolinux/boot.msg b/iso/isolinux/boot.msg index 62273f8..d43da95 100644 --- a/iso/isolinux/boot.msg +++ b/iso/isolinux/boot.msg @@ -1,4 +1,4 @@ - Welcome to the CRUX 3.0 installation media! + Welcome to the CRUX 3.1 installation media! Press <Enter> to boot using the default 'CRUX' image or use one of the others in the following list: |