root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix calameres paths

Browse source
This commit is contained in:
udeved 2014-12-14 18:32:40 +01:00
parent 6f2487c5ad
commit 87eb49cdac
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/util-livecd.sh
View file

@ -282,8 +282,8 @@ configure_accountsservice(){
# $1: chroot
configure_calamares(){
msg2 "Configuring Calamares ..."
mkdir -p ${work_dir}/overlay/etc/calamares/modules
local UNPACKFS="$1/overlay/etc/calamares/modules/unpackfs.conf"
mkdir -p ${work_dir}/etc/calamares/modules
local UNPACKFS="$1/etc/calamares/modules/unpackfs.conf"
if [ ! -e $UNPACKFS ] ; then
echo "---" > "$UNPACKFS"
echo "unpack:" >> "$UNPACKFS"
@ -294,7 +294,7 @@ configure_calamares(){
echo " sourcefs: \"squashfs\"" >> "$UNPACKFS"
echo " destination: \"\"" >> "$UNPACKFS"
fi
local DISPLAYMANAGER="$1/overlay/etc/calamares/modules/displaymanager.conf"
local DISPLAYMANAGER="$1/etc/calamares/modules/displaymanager.conf"
# TODO maybe add a configuration flag in manjaro-tools.conf for default displymanager
if [ ! -e $DISPLAYMANAGER ] ; then
echo "---" > "$DISPLAYMANAGER"
@ -321,7 +321,7 @@ configure_calamares(){
echo " - slim" >> "$DISPLAYMANAGER"
fi
fi
local INITCPIO="$1/overlay/etc/calamares/modules/initcpio.conf"
local INITCPIO="$1/etc/calamares/modules/initcpio.conf"
if [ ! -e $INITCPIO ] ; then
echo "---" > "$INITCPIO"
echo "kernel: ${manjaro_kernel}" >> "$INITCPIO"