summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmk14
-rw-r--r--settings.conf15
2 files changed, 14 insertions, 15 deletions
diff --git a/mk b/mk
index a9470f630..42f7dc613 100755
--- a/mk
+++ b/mk
@@ -24,14 +24,12 @@ fi
echo "\n--- running cmake ---\n"
cd build
-cmake -DCMAKE_BUILD_TYPE=Debug \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DWITH_CRASHREPORTER=OFF \
- -DSKIP_MODULES="dracut dracutlukscfg dummycpp dummyprocess dummypython \
- dummypythonqt grubcfg initramfs initramfscfg \
- interactiveterminal license luksbootkeyfile \
- luksopenswaphookcfg plymouthcfg removeuser webview" ..
+cmake -DCMAKE_BUILD_TYPE=Debug \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DSKIP_MODULES="dracut dracutlukscfg dummycpp dummyprocess dummypython \
+ dummypythonqt grubcfg initramfs initramfscfg tracking \
+ interactiveterminal license plymouthcfg removeuser webview" ..
echo "\n--- running make uninstall ---\n"
diff --git a/settings.conf b/settings.conf
index 89494a31e..8ec14c98e 100644
--- a/settings.conf
+++ b/settings.conf
@@ -63,28 +63,29 @@ sequence:
- welcome
- locale
- keyboard
+ - users
# - netinstall
- partition
- - users
# - tracking
- summary
- exec:
- partition
- pacstrap
+ - pacstrap-base
+ - pacstrap-gui
- mount
# - unpackfs
- - networkcfg
+# - networkcfg
# - packages
- machineid
- fstab
- locale
- keyboard
- localecfg
-# - initcpiocfg
-# - initcpio
- - umount
- - desktop
- - mount
+ - luksbootkeyfile
+ - luksopenswaphookcfg
+ - initcpiocfg
+ - initcpio
- users
- displaymanager
- hwclock