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

buildiso; default to overlayfs for hooks

Browse source
This commit is contained in:
udeved 2016-10-12 12:58:14 +02:00
parent 94c5d1ca56
commit c47afc3878
7 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -85,7 +85,7 @@ EFI_ISO = \
CPIOHOOKS = \
initcpio/hooks/miso \
initcpio/hooks/miso_overlayfs \
initcpio/hooks/miso_aufs \
initcpio/hooks/miso_loop_mnt \
initcpio/hooks/miso_pxe_common \
initcpio/hooks/miso_pxe_http \
@ -95,7 +95,7 @@ CPIOHOOKS = \
CPIOINST = \
initcpio/install/miso \
initcpio/install/miso_overlayfs \
initcpio/install/miso_aufs \
initcpio/install/miso_loop_mnt \
initcpio/install/miso_pxe_common \
initcpio/install/miso_pxe_http \

BIN
initcpio/hooks/.miso.kate-swp
View file

Binary file not shown.

20
initcpio/hooks/miso
View file

@ -39,13 +39,14 @@ _mnt_dmsnapshot() {
# args: source, newroot, mountpoint
_mnt_overlayfs() {
local src="${1}"
local lower_dir="${1}"
local newroot="${2}"
local mnt="${3}"
# msg "::: Adding new aufs branch: ${src} to ${newroot}${mnt}"
# mount -t aufs aufs -o remount,append:"${src}"=ro "${newroot}${mnt}"
local work_dir="/run/miso/cowspace/${cow_directory}/workdir"
local upper_dir="/run/miso/cowspace/${cow_directory}/upperdir"
mount -t aufs aufs -o remount,append:"${src}"=ro "${newroot}${mnt}"
mkdir -p "${upper_dir}" "${work_dir}"
mount -t overlay overlay -o lowerdir="${lower_dir}",upperdir="${upper_dir}",workdir="${work_dir}" "${newroot}${mnt}"
}
# args: /path/to/image_file, mountpoint
@ -99,8 +100,8 @@ _mnt_dev() {
_verify_checksum() {
local _status
cd "/run/miso/bootmnt/${misobasedir}/${arch}"
md5sum -c airootfs.md5 > /tmp/checksum.log 2>&1
cd "/run/archiso/bootmnt/${misobasedir}/${arch}"
md5sum -c $1.md5 > /tmp/checksum.log 2>&1
_status=$?
cd "${OLDPWD}"
return ${_status}
@ -108,8 +109,8 @@ _verify_checksum() {
_verify_signature() {
local _status
cd "/run/miso/bootmnt/${misobasedir}/${arch}"
gpg --homedir /gpg --status-fd 1 --verify airootfs.sfs.sig 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
cd "/run/archiso/bootmnt/${misobasedir}/${arch}"
gpg --homedir /gpg --status-fd 1 --verify $1.sfs.sig 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
_status=$?
cd "${OLDPWD}"
return ${_status}
@ -118,7 +119,8 @@ _verify_signature() {
run_hook() {
[[ -z "${arch}" ]] && arch="$(uname -m)"
[[ -z "${copytoram_size}" ]] && copytoram_size="75%"
[[ -z "${misobasedir}" ]] && misobasedir="arch"
[[ -z "${misobasedir}" ]] && misobasedir="manjaro"
[[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch"
[[ -z "${misodevice}" ]] && misodevice="/dev/disk/by-label/${misolabel}"
[[ -z "${cow_spacesize}" ]] && cow_spacesize="256M"

20
initcpio/hooks/miso_overlayfs → initcpio/hooks/miso_aufs
View file

@ -39,14 +39,13 @@ _mnt_dmsnapshot() {
# args: source, newroot, mountpoint
_mnt_overlayfs() {
local lower_dir="${1}"
local src="${1}"
local newroot="${2}"
local mnt="${3}"
local work_dir="/run/miso/cowspace/${cow_directory}/workdir"
local upper_dir="/run/miso/cowspace/${cow_directory}/upperdir"
# msg "::: Adding new aufs branch: ${src} to ${newroot}${mnt}"
# mount -t aufs aufs -o remount,append:"${src}"=ro "${newroot}${mnt}"
mkdir -p "${upper_dir}" "${work_dir}"
mount -t overlay overlay -o lowerdir="${lower_dir}",upperdir="${upper_dir}",workdir="${work_dir}" "${newroot}${mnt}"
mount -t aufs aufs -o remount,append:"${src}"=ro "${newroot}${mnt}"
}
# args: /path/to/image_file, mountpoint
@ -100,8 +99,8 @@ _mnt_dev() {
_verify_checksum() {
local _status
cd "/run/archiso/bootmnt/${misobasedir}/${arch}"
md5sum -c $1.md5 > /tmp/checksum.log 2>&1
cd "/run/miso/bootmnt/${misobasedir}/${arch}"
md5sum -c airootfs.md5 > /tmp/checksum.log 2>&1
_status=$?
cd "${OLDPWD}"
return ${_status}
@ -109,8 +108,8 @@ _verify_checksum() {
_verify_signature() {
local _status
cd "/run/archiso/bootmnt/${misobasedir}/${arch}"
gpg --homedir /gpg --status-fd 1 --verify $1.sfs.sig 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
cd "/run/miso/bootmnt/${misobasedir}/${arch}"
gpg --homedir /gpg --status-fd 1 --verify airootfs.sfs.sig 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
_status=$?
cd "${OLDPWD}"
return ${_status}
@ -119,8 +118,7 @@ _verify_signature() {
run_hook() {
[[ -z "${arch}" ]] && arch="$(uname -m)"
[[ -z "${copytoram_size}" ]] && copytoram_size="75%"
[[ -z "${misobasedir}" ]] && misobasedir="manjaro"
[[ -z "${misobasedir}" ]] && misobasedir="arch"
[[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch"
[[ -z "${misodevice}" ]] && misodevice="/dev/disk/by-label/${misolabel}"
[[ -z "${cow_spacesize}" ]] && cow_spacesize="256M"

2
initcpio/install/miso
View file

@ -4,7 +4,7 @@ build() {
add_module "cdrom"
add_module "loop"
add_module "dm-snapshot"
add_module "aufs"
add_module "overlay"
add_runscript

2
initcpio/install/miso_overlayfs → initcpio/install/miso_aufs
View file

@ -4,7 +4,7 @@ build() {
add_module "cdrom"
add_module "loop"
add_module "dm-snapshot"
add_module "overlay"
add_module "aufs"
add_runscript

2
lib/util-iso-boot.sh
View file

@ -20,7 +20,7 @@ set_mkinicpio_hooks(){
sed -e 's/plymouth //' -i $1
fi
if ! ${use_overlayfs};then
sed -e 's/miso_overlayfs /miso /' -i $1
sed -e 's/miso /miso_aufs /' -i $1
fi
}