--- mcore-src/trunk/mcore-tools/daemon/client/include/boot.client.class 2013/05/10 10:44:38 2074 +++ mcore-src/trunk/mcore-tools/daemon/client/include/boot.client.class 2013/05/10 11:02:36 2078 @@ -25,7 +25,7 @@ helper_get_boot_splash_plymouth() { - if grep "^export GRUB_CMDLINE_BOOTSPLASH=.*splash" /etc/conf.d/grub + if grep "^export GRUB_CMDLINE_BOOTSPLASH=.*splash" ${MROOT}/etc/conf.d/grub then mecho "bootsplash currently enabled" rvecho "1" @@ -38,7 +38,7 @@ helper_get_boot_splash_fbsplash() { local var - var=$(grep "^export GRUB_CMDLINE_BOOTSPLASH=" /etc/conf.d/grub | sed "s:.*splash=\(.*\),.*:\1:") + var=$(grep "^export GRUB_CMDLINE_BOOTSPLASH=" ${MROOT}/etc/conf.d/grub | sed "s:.*splash=\(.*\),.*:\1:") case "${var}" in silent|"") mecho "bootsplash currently enabled"; rvecho "1" ;; @@ -64,12 +64,12 @@ case "${action}" in enable) - sed -i "s:^\(export GRUB_CMDLINE_BOOTSPLASH=\).*:\1\"splash\":" /etc/conf.d/grub + sed -i "s:^\(export GRUB_CMDLINE_BOOTSPLASH=\).*:\1\"splash\":" ${MROOT}/etc/conf.d/grub helper_boot_rebuild_bootconfig mecho "bootsplash enabled" ;; disable) - sed -i "s:^\(export GRUB_CMDLINE_BOOTSPLASH=\).*:\1\"rd.plymouth=0\":" /etc/conf.d/grub + sed -i "s:^\(export GRUB_CMDLINE_BOOTSPLASH=\).*:\1\"rd.plymouth=0\":" ${MROOT}/etc/conf.d/grub helper_boot_rebuild_bootconfig mecho "bootsplash disabled" ;; @@ -84,12 +84,12 @@ case "${action}" in enable) - sed -i "s:^\(export GRUB_CMDLINE_BOOTSPLASH=\).*:\1\"splash=silent,theme=default\":" /etc/conf.d/grub + sed -i "s:^\(export GRUB_CMDLINE_BOOTSPLASH=\).*:\1\"splash=silent,theme=default\":" ${MROOT}/etc/conf.d/grub helper_boot_rebuild_bootconfig mecho "bootsplash enabled" ;; disable) - sed -i "s:^\(export GRUB_CMDLINE_BOOTSPLASH=\).*:\1\"splash=verbose,theme=default\":" /etc/conf.d/grub + sed -i "s:^\(export GRUB_CMDLINE_BOOTSPLASH=\).*:\1\"splash=verbose,theme=default\":" ${MROOT}/etc/conf.d/grub helper_boot_rebuild_bootconfig mecho "bootsplash disabled" ;; @@ -142,7 +142,7 @@ helper_get_boot_theme_fbsplash() { local action="$1" - local themedir="/etc/splash/themes" + local themedir="${MROOT}/etc/splash/themes" local theme local i @@ -157,7 +157,7 @@ fi ;; system) - list_files_in_directory -type d -mindepth 1 -maxdepth 1 ${MROOT}/etc/splash/themes + list_files_in_directory -type d -mindepth 1 -maxdepth 1 ${themedir} ;; *) help_boot_theme @@ -179,7 +179,7 @@ helper_set_boot_theme_plymouth() { local theme="$1" - local themedir="/usr/share/plymouth/themes" + local themedir="${MROOT}/usr/share/plymouth/themes" [[ -z ${theme} ]] && help_boot_theme && return 1 if [[ -d ${themedir}/${theme} ]] @@ -194,7 +194,7 @@ helper_set_boot_theme_fbsplash() { local theme="$1" - local themedir="/etc/splash/themes" + local themedir="${MROOT}/etc/splash/themes" [[ -z ${theme} ]] && help_boot_theme && return 1 if [[ -d ${themedir}/${theme} ]]