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

refactor and fix incorrect config file specified

Browse source
This commit is contained in:
Aaditya Bagga 2014-12-18 22:21:48 +05:30
parent 3312958b31
commit 8b5cdc0431
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/util-livecd.sh
View file

@ -297,9 +297,9 @@ configure_alsa_live(){
configure_live_image () { configure_live_image () {
_conf_file="$1" # Configuration file passed as first argument _conf_file="$1" # Configuration file passed as first argument
if [ -e "$_conf_file" ] ; then if [ -e "$_conf_file" ] ; then
sed -i "s|_root-image_|/bootmnt/${install_dir}/_ARCH_/root-image.sqfs|g" $_conf_file sed -i "s|_root-image_|/bootmnt/${install_dir}/_ARCH_/root-image.sqfs|g" $_conf_file
sed -i "s|_kernel_|$manjaro_kernel|g" "/usr/share/calamares/modules/initcpio.conf"
if [ -e "/bootmnt/${install_dir}/${arch}/xfce-image.sqfs" ] ; then if [ -e "/bootmnt/${install_dir}/${arch}/xfce-image.sqfs" ] ; then
sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/xfce-image.sqfs|g" $_conf_file sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/xfce-image.sqfs|g" $_conf_file
@ -348,14 +348,7 @@ configure_live_installer_live(){
fi fi
release=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2) release=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2)
sed -i "s|_version_|$release|g" $conf_file sed -i "s|_version_|$release|g" $conf_file
configure_live_image $conf_file sed -i "s|_kernel_|$manjaro_kernel|g" $conf_file
}
configure_calamares_live(){
if [ -e "/usr/share/calamares/settings.conf" ] ; then
echo "configure calamares" >> /tmp/livecd.log
conf_file="/usr/share/calamares/modules/unpackfs.conf"
fi
configure_live_image $conf_file configure_live_image $conf_file
} }
@ -366,6 +359,16 @@ configure_thus_live(){
fi fi
release=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2) release=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2)
sed -i "s|_version_|$release|g" $conf_file sed -i "s|_version_|$release|g" $conf_file
sed -i "s|_kernel_|$manjaro_kernel|g" $conf_file
configure_live_image $conf_file
}
configure_calamares_live(){
if [ -e "/usr/share/calamares/settings.conf" ] ; then
echo "configure calamares" >> /tmp/livecd.log
conf_file="/usr/share/calamares/modules/unpackfs.conf"
fi
sed -i "s|_kernel_|$manjaro_kernel|g" "/usr/share/calamares/modules/initcpio.conf"
configure_live_image $conf_file configure_live_image $conf_file
} }