Revision abade4ea

b/common.sh.in
99 99
}
100 100

  
101 101
get_os_type() {
102
    if [ -e ${TARGET}/etc/redhat-release ] ; then
102
    target=$1
103
    if [ -z "${target}" ] ; then
104
        log_error "target is not set in get_os_type"
105
        exit 1
106
    fi
107
    if [ -e ${target}/etc/redhat-release ] ; then
103 108
        OS_TYPE="redhat"
104
    elif [ -e ${TARGET}/etc/debian_version ] ; then
109
    elif [ -e ${target}/etc/debian_version ] ; then
105 110
        OS_TYPE="debian"
106
    elif [ -e ${TARGET}/etc/gentoo-release ] ; then
111
    elif [ -e ${target}/etc/gentoo-release ] ; then
107 112
        OS_TYPE="gentoo"
108
    elif [ -e ${TARGET}/etc/SuSE-release ] ; then
113
    elif [ -e ${target}/etc/SuSE-release ] ; then
109 114
        OS_TYPE="suse"
110 115
    fi
111 116
}
112 117

  
118
get_os() {
119
    target=$1
120
    if [ -z "${target}" ] ; then
121
        log_error "target is not set in get_os"
122
        exit 1
123
    fi
124
    lsb="$(which lsb_release)"
125
    if [ -n "$lsb" ] ; then
126
        OPERATING_SYSTEM="$(${lsb} -i -s | tr "[:upper:]" "[:lower:]")"
127
    elif [ -e ${target}/etc/debian_version ] ; then
128
        OPERATING_SYSTEM="debian"
129
    elif [ -e ${target}/etc/gentoo-release ] ; then
130
        OPERATING_SYSTEM="gentoo"
131
    elif [ -e ${target}/etc/fedora-release ] ; then
132
        OPERATING_SYSTEM="fedora"
133
    elif [ -e ${$target}/etc/redhat-release ] ; then
134
        if [ -n "$(grep -i centos ${target}/etc/redhat-release)" ] ; then
135
            OPERATING_SYSTEM="centos"
136
        else
137
            OPERATING_SYSTEM="redhat"
138
        fi
139
    fi
140
}
141

  
142
get_os_release() {
143
    target=$1
144
    if [ -z "${target}" ] ; then
145
        log_error "target is not set in get_os_release"
146
        exit 1
147
    fi
148
    lsb="$(which lsb_release)"
149
    if [ -n "$lsb" ] ; then
150
        OS_RELEASE="$(${lsb} -r -s | tr "[:upper:]" "[:lower:]")"
151
    elif [ -e ${target}/etc/debian_version ] ; then
152
        OS_RELEASE="$(cat ${target}/etc/debian_version)"
153
    elif [ -e ${target}/etc/fedora-release ] ; then
154
        OS_RELEASE="$(cat ${target}/etc/fedora-release | awk '{print $3}')"
155
    elif [ -e ${$target}/etc/redhat-release ] ; then
156
        OS_RELEASE="$(cat ${target}/etc/redhat-release | awk '{print $3}')"
157
    fi
158
}
159

  
113 160
format_disk0() {
114 161
    local sfdisk_cmd="$SFDISK -uM -H 255 -S 63 --quiet --Linux $1"
115 162
    if [  "${SWAP}" = "yes" -a -z "${KERNEL_PATH}" ] ; then
b/example/instance-image.d/interfaces
118 118
}
119 119

  
120 120
# Main
121
get_os_type
121
get_os_type $TARGET
122 122

  
123 123
if [ "${NIC_COUNT}" -gt 0 -a -n "${OS_TYPE}" ] ; then
124 124
    ${OS_TYPE}_setup
b/rename
40 40
boot_dev=$(map_partition $filesystem_dev boot)
41 41

  
42 42
mount_disk0 $TARGET
43
get_os_type
43
get_os_type $TARGET
44 44

  
45 45
case "${OS_TYPE}" in
46 46
    debian)

Also available in: Unified diff