root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

proper machine-id

Browse source
This commit is contained in:
Philip 2015-01-10 15:53:11 +01:00
parent 6676d52a15
commit 621657f36f
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/util-iso.sh
View file

@ -406,7 +406,7 @@ configure_livecd_image(){
${auto_svc_conf} && configure_services_live "$1"
# configure_machine_id "$1"
configure_machine_id "$1"
configure_hostname "$1"
@ -467,6 +467,14 @@ download_to_cache(){
# Build ISO
make_iso() {
# cleanup machine-id
if [[ -e ${work_dir}/root-image/etc/machine-id ]]; then
rm ${work_dir}/root-image/etc/machine-id &> /dev/null
fi
if [[ -e ${work_dir}/root-image/var/lib/dbus/machine-id ]]; then
rm ${work_dir}/root-image/var/lib/dbus/machine-id &> /dev/null
fi
msg "Start [Build ISO]"
touch "${work_dir}/iso/.miso"
@ -525,11 +533,13 @@ make_root_image() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
msg "Prepare [Base installation] (root-image)"
mkiso ${create_args[*]} -p "${packages}" -i "root-image" create "${work_dir}" || die "Please check you Packages file! Exiting."
mkdir -p ${work_dir}/root-image/etc
mkdir -p ${work_dir}/root-image/var/lib/dbus
configure_machine_id "${work_dir}/root-image"
mkiso ${create_args[*]} -p "${packages}" -i "root-image" create "${work_dir}" || die "Please check you Packages file! Exiting."
# mkdir -p "${work_dir}/iso/${install_dir}/${arch}"
#
# setarch ${arch} \