diff options
| author | Christian Neukirchen <chneukirchen@gmail.com> | 2015-10-09 15:24:32 +0200 |
|---|---|---|
| committer | Christian Neukirchen <chneukirchen@gmail.com> | 2015-10-09 15:43:55 +0200 |
| commit | 44722b79e2f31c0c51bd2fc8c8d43c0009d79529 (patch) | |
| tree | 5fc9fce8937199de06e2c22ad781e59fa654dfd2 /isolinux | |
| parent | a25ced5c198fff963ba7b7e9b613059e756374c0 (diff) | |
| parent | cb2510b3791091fb54681cee451eb7ec24e0b266 (diff) | |
| download | hrmpf-44722b79e2f31c0c51bd2fc8c8d43c0009d79529.tar.gz hrmpf-44722b79e2f31c0c51bd2fc8c8d43c0009d79529.tar.xz hrmpf-44722b79e2f31c0c51bd2fc8c8d43c0009d79529.zip | |
Merge remote-tracking branch 'origin/master'
* origin/master: (136 commits)
dracut/services: don't autostart dmeventd, lvmetad and mdadm.
mklive: fix guessing linux kernel pkgname.
fix set_keymap rc.conf
installer.sh: fix static IP settings in menu_install
build-arm-images: PLATFORM can be overrided now.
build-rootfs: build musl rootfs too; PLATFORMS can be overrided now.
build-x86-images: added lxqt image.
dracut/dm-autologin: autostart lxqt if available.
mkrootfs: add dockstar support
mklive: install GRUB EFI loader as EFI/BOOT/BOOTX64.EFI.
build-x86-images: add gnome-keyring to cinnamon/mate/xfce images.
build-x86-images: add firefox now it's available for musl.
build-arm-images: respect musl targets.
mkimage: consistently redirect std{err,out} to /dev/null with dd(1).
build-arm-images: disable cubietruck for now; does not boot.
build-arm-images: build all ARM images for glibc and musl.
mkrootfs: get rid of pixz; fix rpi target arch.
mkrootfs: set cachedir to $PWD/xbps-cachedir-<arch>; misc tweaks for musl.
mkrootfs: update for musl support.
build-x86-images: do not build the kde image; does not work yet.
...
Diffstat (limited to 'isolinux')
| -rw-r--r-- | isolinux/isolinux.cfg.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/isolinux/isolinux.cfg.in b/isolinux/isolinux.cfg.in index 33ea352..5af8bf6 100644 --- a/isolinux/isolinux.cfg.in +++ b/isolinux/isolinux.cfg.in @@ -25,9 +25,9 @@ MENU LABEL @@BOOT_TITLE@@ @@KERNVER@@ @@ARCH@@ KERNEL /boot/vmlinuz APPEND initrd=/boot/initrd root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ LABEL linuxram -MENU LABEL @@BOOT_TITLE@@ @@KERNVER@@ @@ARCH@@ (load to RAM) +MENU LABEL @@BOOT_TITLE@@ @@KERNVER@@ @@ARCH@@ (RAM) KERNEL /boot/vmlinuz -APPEND initrd=/boot/initrd root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ rd.live.ram=1 +APPEND initrd=/boot/initrd root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ rd.live.ram LABEL memtest86+ MENU LABEL memtest86+ KERNEL /boot/memtest86+ |