initrd.d: move is_livecd() back to 00-common.sh to avoid circular deps

12 years ago · 4fad24c756
parent 0308b18e1e
commit 4fad24c756
2 changed files with 5 additions and 5 deletions
--- a/defaults/initrd.d/00-common.sh
+++ b/defaults/initrd.d/00-common.sh
@ -5,6 +5,11 @@ is_nfs() {
    return 1
 }

+is_livecd() {
+    [ "${CDROOT}" = "1" ] && return 0
+    return 1
+}
+
 good_msg() {
    [ -n "${QUIET}" ] && [ -z "${DEBUG}" ] && return 0

--- a/defaults/initrd.d/00-livecd.sh
+++ b/defaults/initrd.d/00-livecd.sh
@ -268,11 +268,6 @@ _livecd_mount_copy_content() {
    mount --bind "${CDROOT_PATH}" "${new_cdroot}"
 }

-is_livecd() {
-    [ "${CDROOT}" = "1" ] && return 0
-    return 1
-}
-
 media_find() {
    # $1 = mount dir name / media name
    # $2 = recognition file