summaryrefslogtreecommitdiff
path: root/app-misc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-06-02 13:06:57 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-06-02 13:06:57 +0100
commit537d08697675f03cd5d3d75977291fe302849bab (patch)
tree89f08e6e723340b9ede0b0fec2449106268aaec1 /app-misc
parent8ef8383274af7c6dc8215caf7b2af8ad5770b605 (diff)
Revert "machineid is only needed on systemd, so drop it, or installation will fail"
This reverts commit 8ef8383274af7c6dc8215caf7b2af8ad5770b605.
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/calamares-config-redcore/files/modules/bootloader.conf4
-rw-r--r--app-misc/calamares-config-redcore/files/settings.conf1
2 files changed, 3 insertions, 2 deletions
diff --git a/app-misc/calamares-config-redcore/files/modules/bootloader.conf b/app-misc/calamares-config-redcore/files/modules/bootloader.conf
index 85db8995..5798c14f 100644
--- a/app-misc/calamares-config-redcore/files/modules/bootloader.conf
+++ b/app-misc/calamares-config-redcore/files/modules/bootloader.conf
@@ -5,8 +5,8 @@ efiBootLoader: "grub"
# systemd-boot configuration files settings, set kernel and initramfs file names
# and amount of time before default selection boots
-kernel: "/boot/kernel-genkernel-x86_64-4.9.30-redcore"
-img: "/boot/initramfs-genkernel-x86_64-4.9.30-redcore"
+kernel: "/boot/kernel-genkernel-x86_64-4.9.15-redcore"
+img: "/boot/initramfs-genkernel-x86_64-4.9.15-redcore"
timeout: "10"
# Optionally set the menu entry name and kernel name to use in systemd-boot.
# If not specified here, these settings will be taken from branding.desc.
diff --git a/app-misc/calamares-config-redcore/files/settings.conf b/app-misc/calamares-config-redcore/files/settings.conf
index 67a2b2dd..91f9fe80 100644
--- a/app-misc/calamares-config-redcore/files/settings.conf
+++ b/app-misc/calamares-config-redcore/files/settings.conf
@@ -70,6 +70,7 @@ sequence:
- partition
- mount
- unpackfs
+ - machineid
- fstab
- locale
- keyboard