From 4fad24c7569a615857bddc51e58d64bebe648d02 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sat, 31 Aug 2013 12:12:34 +0200
Subject: [PATCH] initrd.d: move is_livecd() back to 00-common.sh to avoid
 circular deps

---
 defaults/initrd.d/00-common.sh | 5 +++++
 defaults/initrd.d/00-livecd.sh | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/defaults/initrd.d/00-common.sh b/defaults/initrd.d/00-common.sh
index 8302e76..93bbc94 100755
--- 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
 
diff --git a/defaults/initrd.d/00-livecd.sh b/defaults/initrd.d/00-livecd.sh
index 35fcb37..d5da794 100755
--- 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