commit
9a06e8d6b9
5 changed files with 15 additions and 10 deletions
|
@ -19,7 +19,6 @@ SYSCONFDIR='@sysconfdir@'
|
||||||
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
||||||
|
|
||||||
import ${LIBDIR}/util.sh
|
import ${LIBDIR}/util.sh
|
||||||
import ${LIBDIR}/util-iso.sh
|
|
||||||
|
|
||||||
show_profile(){
|
show_profile(){
|
||||||
cd $1
|
cd $1
|
||||||
|
@ -182,6 +181,8 @@ prepare_dir "${cache_dir_iso}"
|
||||||
|
|
||||||
eval_buildset "${buildset_iso}" "${sets_dir_iso}"
|
eval_buildset "${buildset_iso}" "${sets_dir_iso}"
|
||||||
|
|
||||||
|
import ${LIBDIR}/util-iso.sh
|
||||||
|
|
||||||
check_requirements
|
check_requirements
|
||||||
|
|
||||||
${pretend} && display_settings && exit 1
|
${pretend} && display_settings && exit 1
|
||||||
|
|
|
@ -11,12 +11,12 @@
|
||||||
|
|
||||||
# $1: new branch
|
# $1: new branch
|
||||||
mount_root_image(){
|
mount_root_image(){
|
||||||
msg2 "mount [root-image] on [${1##*/}]"
|
msg2 "aufs: mount [root-image] on [${1##*/}]"
|
||||||
mount -t aufs -o br="$1":${work_dir}/root-image=ro none "$1"
|
mount -t aufs -o br="$1":${work_dir}/root-image=ro none "$1"
|
||||||
}
|
}
|
||||||
|
|
||||||
mount_custom_image(){
|
mount_custom_image(){
|
||||||
msg2 "mount [${1##*/}] on [${custom}-image]"
|
msg2 "aufs: mount [${1##*/}] on [${custom}-image]"
|
||||||
mount -t aufs -o br="$1":${work_dir}/${custom}-image=ro:${work_dir}/root-image=ro none "$1"
|
mount -t aufs -o br="$1":${work_dir}/${custom}-image=ro:${work_dir}/root-image=ro none "$1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -203,11 +203,15 @@ write_isolinux_cfg(){
|
||||||
echo '' >> ${conf}
|
echo '' >> ${conf}
|
||||||
echo "label start" >> ${conf}
|
echo "label start" >> ${conf}
|
||||||
echo " kernel /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
|
echo " kernel /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
|
||||||
|
plymouth_settings=" quiet splash"
|
||||||
|
if ! ${plymouth_boot};then
|
||||||
|
plymouth_settings=""
|
||||||
|
fi
|
||||||
if [[ -f ${path_iso}/${iso_name}/boot/intel_ucode.img ]] ; then
|
if [[ -f ${path_iso}/${iso_name}/boot/intel_ucode.img ]] ; then
|
||||||
msg2 "Using intel_ucode.img ..."
|
msg2 "Using intel_ucode.img ..."
|
||||||
echo " append initrd=/${iso_name}/boot/intel_ucode.img,/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free quiet splash showopts" >> ${conf}
|
echo " append initrd=/${iso_name}/boot/intel_ucode.img,/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free${plymouth_settings} showopts" >> ${conf}
|
||||||
else
|
else
|
||||||
echo " append initrd=/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free quiet splash showopts" >> ${conf}
|
echo " append initrd=/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 logo.nologo overlay=free${plymouth_settings} showopts" >> ${conf}
|
||||||
fi
|
fi
|
||||||
echo '' >> ${conf}
|
echo '' >> ${conf}
|
||||||
if ${nonfree_xorg};then
|
if ${nonfree_xorg};then
|
||||||
|
@ -215,9 +219,9 @@ write_isolinux_cfg(){
|
||||||
echo " kernel /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
|
echo " kernel /${iso_name}/boot/${arch}/${iso_name}" >> ${conf}
|
||||||
if [[ -f ${path_iso}/${iso_name}/boot/intel_ucode.img ]] ; then
|
if [[ -f ${path_iso}/${iso_name}/boot/intel_ucode.img ]] ; then
|
||||||
msg2 "Using intel_ucode.img ..."
|
msg2 "Using intel_ucode.img ..."
|
||||||
echo " append initrd=/${iso_name}/boot/intel_ucode.img,/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree quiet splash showopts" >> ${conf}
|
echo " append initrd=/${iso_name}/boot/intel_ucode.img,/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree${plymouth_settings} showopts" >> ${conf}
|
||||||
else
|
else
|
||||||
echo " append initrd=/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree quiet splash showopts" >> ${conf}
|
echo " append initrd=/${iso_name}/boot/${arch}/${iso_name}.img misobasedir=${iso_name} misolabel=${iso_label} nouveau.modeset=0 i915.modeset=1 radeon.modeset=0 nonfree=yes logo.nologo overlay=nonfree${plymouth_settings} showopts" >> ${conf}
|
||||||
fi
|
fi
|
||||||
echo '' >> ${conf}
|
echo '' >> ${conf}
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -115,7 +115,7 @@ configure_services(){
|
||||||
# $1: chroot
|
# $1: chroot
|
||||||
configure_environment(){
|
configure_environment(){
|
||||||
case ${custom} in
|
case ${custom} in
|
||||||
gnome|xfce|openbox|enlightenment|cinnamon|pekwm|lxde|mate)
|
cinnamon|enlightenment|gnome|i3|lxde|mate|netbook|openbox|pantheon|xfce|xfce-minimal|xfce-openrc)
|
||||||
echo "QT_STYLE_OVERRIDE=gtk" >> $1/etc/environment
|
echo "QT_STYLE_OVERRIDE=gtk" >> $1/etc/environment
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
@ -11,13 +11,13 @@
|
||||||
|
|
||||||
# $1: new branch
|
# $1: new branch
|
||||||
mount_root_image(){
|
mount_root_image(){
|
||||||
msg2 "mount [root-image] on [${1##*/}]"
|
msg2 "overlayfs: mount [root-image] on [${1##*/}]"
|
||||||
mkdir -p "${work_dir}/work"
|
mkdir -p "${work_dir}/work"
|
||||||
mount -t overlay overlay -olowerdir="${work_dir}/root-image",upperdir="$1",workdir="${work_dir}/work" "$1"
|
mount -t overlay overlay -olowerdir="${work_dir}/root-image",upperdir="$1",workdir="${work_dir}/work" "$1"
|
||||||
}
|
}
|
||||||
|
|
||||||
mount_custom_image(){
|
mount_custom_image(){
|
||||||
msg2 "mount [${1##*/}] on [${custom}-image]"
|
msg2 "overlayfs: mount [${1##*/}] on [${custom}-image]"
|
||||||
mkdir -p "${work_dir}/work"
|
mkdir -p "${work_dir}/work"
|
||||||
mount -t overlay overlay -olowerdir="${work_dir}/${custom}-image":"${work_dir}/root-image",upperdir="$1",workdir="${work_dir}/work" "$1"
|
mount -t overlay overlay -olowerdir="${work_dir}/${custom}-image":"${work_dir}/root-image",upperdir="$1",workdir="${work_dir}/work" "$1"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue