forked from artix/artools
Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
ede2ac11e2 | |||
e8913b07c3 | |||
f5f9a2acb8 |
@@ -168,7 +168,7 @@ write_unpackfs_conf(){
|
||||
yaml+=$(write_yaml_map 0 'unpack')
|
||||
yaml+=$(write_yaml_seq_map 2 'source' "/run/artix/bootmnt/artix/x86_64/rootfs.sfs")
|
||||
yaml+=$(write_yaml_map 4 'sourcefs' 'squashfs')
|
||||
yaml+=$(write_yaml_map 4 'destination' '')
|
||||
yaml+=$(write_yaml_map 4 'destination' '""')
|
||||
yaml+=$(write_empty_line)
|
||||
printf '%s' "${yaml}"
|
||||
}
|
||||
|
@@ -32,7 +32,7 @@ prepare_initramfs(){
|
||||
su ${OWNER} -c "gpg --export ${GPG_KEY} >/tmp/GPG_KEY"
|
||||
exec 17<>/tmp/GPG_KEY
|
||||
fi
|
||||
local _kernel=$(cat $mnt/usr/lib/modules/*/version)
|
||||
local _kernel=$(<$mnt/usr/src/linux/version)
|
||||
ARTIX_GNUPG_FD=${GPG_KEY:+17} artools-chroot $mnt \
|
||||
/usr/bin/mkinitcpio -k ${_kernel} \
|
||||
-c /etc/mkinitcpio-artix.conf \
|
||||
|
@@ -81,7 +81,7 @@ pull_tree(){
|
||||
local remote_head=$(get_remote_head)
|
||||
|
||||
msg "Checking %s (%s)" "${tree}" "$os"
|
||||
if $(has_changes "${local_head}" "${remote_head}");then
|
||||
if has_changes "${local_head}" "${remote_head}";then
|
||||
git pull origin master
|
||||
fi
|
||||
}
|
||||
|
Reference in New Issue
Block a user