fix liveuser removal, drop unused calamares stages

4 files changed, 4 insertions, 10 deletions

diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r1.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r2.ebuild
index 11600728..11600728 100644
--- a/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r1.ebuild
+++ b/app-misc/calamares-config-kogaion/calamares-config-kogaion-3.0-r2.ebuild
diff --git a/app-misc/calamares-config-kogaion/files/modules/bootloader.conf b/app-misc/calamares-config-kogaion/files/modules/bootloader.conf
index c0f5ba9f..134ae9a9 100644
--- a/app-misc/calamares-config-kogaion/files/modules/bootloader.conf
+++ b/app-misc/calamares-config-kogaion/files/modules/bootloader.conf
@@ -6,7 +6,7 @@ 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-3.14.50-kogaion"
-img: "/boot/initramfs-3.14.50-kogaion.img"
+img: "/boot/initramfs-genkernel-x86_64-3.14.50-kogaion"
 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-kogaion/files/modules/removeuser.conf b/app-misc/calamares-config-kogaion/files/modules/removeuser.conf
index 748822da..82e03559 100644
--- a/app-misc/calamares-config-kogaion/files/modules/removeuser.conf
+++ b/app-misc/calamares-config-kogaion/files/modules/removeuser.conf
@@ -1,2 +1,2 @@
 ---
-username: kogaionuser
+username: kogaion
diff --git a/app-misc/calamares-config-kogaion/files/settings.conf b/app-misc/calamares-config-kogaion/files/settings.conf
index 41085536..ae2eb9e3 100644
--- a/app-misc/calamares-config-kogaion/files/settings.conf
+++ b/app-misc/calamares-config-kogaion/files/settings.conf
@@ -28,8 +28,6 @@ prepare:
 # allowed, their names should be added here as placeholders to specify the order in
 # which view module jobs should be enqueued. Job modules are also allowed.
 install:
-#- dummyprocess
-#- dummypython
 - partition
 - mount
 - unpackfs
@@ -38,16 +36,12 @@ install:
 - locale
 - keyboard
 - localecfg
-#- initcpiocfg
-#- initcpio
 - users
+- removeuser
 #- displaymanager
-- networkcfg
 - hwclock
 - dracut
-#- initramfs
 - packages
-- grubcfg
 - bootloader
 - umount
 
@@ -70,4 +64,4 @@ branding: kogaion_branding
 # If this is set to true, Calamares will show an "are you sure?" prompt right before the
 # install phase, i.e. at the point of no return. If it's false, no prompt is shown.
 # Default is false.
-prompt-install: false
+prompt-install: true