summaryrefslogtreecommitdiff
path: root/parabolaiso/initcpio
diff options
context:
space:
mode:
Diffstat (limited to 'parabolaiso/initcpio')
-rw-r--r--parabolaiso/initcpio/hooks/parabolaiso121
-rw-r--r--parabolaiso/initcpio/hooks/parabolaiso_loop_mnt9
-rw-r--r--parabolaiso/initcpio/hooks/parabolaiso_pxe_common36
-rw-r--r--parabolaiso/initcpio/hooks/parabolaiso_pxe_http25
-rw-r--r--parabolaiso/initcpio/hooks/parabolaiso_pxe_nbd21
-rw-r--r--parabolaiso/initcpio/install/parabolaiso8
-rw-r--r--parabolaiso/initcpio/install/parabolaiso_pxe_http2
7 files changed, 132 insertions, 90 deletions
diff --git a/parabolaiso/initcpio/hooks/parabolaiso b/parabolaiso/initcpio/hooks/parabolaiso
index c23fd3d..ef79b2b 100644
--- a/parabolaiso/initcpio/hooks/parabolaiso
+++ b/parabolaiso/initcpio/hooks/parabolaiso
@@ -1,5 +1,5 @@
# args: source, newroot, mountpoint
-_mnt_fs() {
+_mnt_dmsnapshot() {
local img="${1}"
local newroot="${2}"
local mnt="${3}"
@@ -11,19 +11,13 @@ _mnt_fs() {
ro_dev=$(losetup --find --show --read-only "${img}")
echo ${ro_dev} >> /run/parabolaiso/used_block_devices
ro_dev_size=$(blockdev --getsz ${ro_dev})
- if [[ "${cowfile_size}" == "100" ]]; then
- rw_dev_size=${ro_dev_size}
- else
- # size calculation done in this way to avoid integer overflow when ro_dev_size is > 10.2G
- rw_dev_size=$((ro_dev_size/100*cowfile_size))
- fi
if [[ "${cow_persistent}" == "P" ]]; then
if [[ -f "/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
msg ":: Found '/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow', using as persistent."
else
msg ":: Creating '/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow' as persistent."
- dd of="/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${rw_dev_size} &> /dev/null
+ truncate -s "${cow_spacesize}" "/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow"
fi
else
if [[ -f "/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
@@ -31,18 +25,28 @@ _mnt_fs() {
rm -f "/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow"
fi
msg ":: Creating '/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow' as non-persistent."
- dd of="/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${rw_dev_size} &> /dev/null
+ truncate -s "${cow_spacesize}" "/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow"
fi
rw_dev=$(losetup --find --show "/run/parabolaiso/cowspace/${cow_directory}/${img_name}.cow")
echo ${rw_dev} >> /run/parabolaiso/used_block_devices
- echo "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} 8" | dmsetup create ${dm_snap_name}
+ dmsetup create ${dm_snap_name} --table "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}"
- _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w"
+ _mnt_dev "/dev/mapper/${dm_snap_name}" "${newroot}${mnt}" "-w" "defaults"
echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/parabolaiso/used_block_devices
}
+# args: source, newroot, mountpoint
+_mnt_overlayfs() {
+ local src="${1}"
+ local newroot="${2}"
+ local mnt="${3}"
+ mkdir -p /run/parabolaiso/cowspace/${cow_directory}/upperdir /run/parabolaiso/cowspace/${cow_directory}/workdir
+ mount -t overlay -o lowerdir=${src},upperdir=/run/parabolaiso/cowspace/${cow_directory}/upperdir,workdir=/run/parabolaiso/cowspace/${cow_directory}/workdir airootfs "${newroot}${mnt}"
+}
+
+
# args: /path/to/image_file, mountpoint
_mnt_sfs() {
local img="${1}"
@@ -61,14 +65,15 @@ _mnt_sfs() {
fi
sfs_dev=$(losetup --find --show --read-only "${img}")
echo ${sfs_dev} >> /run/parabolaiso/used_block_devices
- _mnt_dev "${sfs_dev}" "${mnt}" "-r"
+ _mnt_dev "${sfs_dev}" "${mnt}" "-r" "defaults"
}
-# args: device, mountpoint, flags
+# args: device, mountpoint, flags, opts
_mnt_dev() {
local dev="${1}"
local mnt="${2}"
local flg="${3}"
+ local opts="${4}"
mkdir -p "${mnt}"
@@ -81,7 +86,7 @@ _mnt_dev() {
launch_interactive_shell
done
- if mount "${flg}" "${dev}" "${mnt}"; then
+ if mount -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
msg ":: Device '${dev}' mounted successfully."
else
echo "ERROR; Failed to mount '${dev}'"
@@ -93,8 +98,17 @@ _mnt_dev() {
_verify_checksum() {
local _status
- cd "/run/parabolaiso/bootmnt/${parabolaisobasedir}"
- md5sum -c checksum.${arch}.md5 > /tmp/checksum.${arch}.log 2>&1
+ cd "/run/parabolaiso/bootmnt/${parabolaisobasedir}/${arch}"
+ sha512sum -c airootfs.sha512 > /tmp/checksum.log 2>&1
+ _status=$?
+ cd "${OLDPWD}"
+ return ${_status}
+}
+
+_verify_signature() {
+ local _status
+ cd "/run/parabolaiso/bootmnt/${parabolaisobasedir}/${arch}"
+ gpg --homedir /gpg --status-fd 1 --verify airootfs.sfs.sig 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
_status=$?
cd "${OLDPWD}"
return ${_status}
@@ -102,22 +116,11 @@ _verify_checksum() {
run_hook() {
[[ -z "${arch}" ]] && arch="$(uname -m)"
- [[ -z "${cowspace_size}" ]] && cowspace_size="75%"
[[ -z "${copytoram_size}" ]] && copytoram_size="75%"
[[ -z "${parabolaisobasedir}" ]] && parabolaisobasedir="parabola"
[[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="parabola"
[[ -z "${parabolaisodevice}" ]] && parabolaisodevice="/dev/disk/by-label/${parabolaisolabel}"
- if [[ -z "${cowfile_size}" ]]; then
- cowfile_size="100"
- else
- cowfile_size=${cowfile_size/%}
- fi
-
- if [[ -z "${aitab}" ]]; then
- aitab="/run/parabolaiso/bootmnt/${parabolaisobasedir}/aitab"
- else
- aitab="/run/parabolaiso/bootmnt/${parabolaisobasedir}/${aitab}"
- fi
+ [[ -z "${cow_spacesize}" ]] && cow_spacesize="256M"
if [[ -n "${cow_label}" ]]; then
cow_device="/dev/disk/by-label/${cow_label}"
@@ -128,7 +131,9 @@ run_hook() {
cow_persistent="N"
fi
+ [[ -z "${cow_flags}" ]] && cow_flags="defaults"
[[ -z "${cow_directory}" ]] && cow_directory="persistent_${parabolaisolabel}/${arch}"
+ [[ -z "${cow_chunksize}" ]] && cow_chunksize="8"
# set mount handler for parabolaiso
mount_handler="parabolaiso_mount_handler"
@@ -141,32 +146,39 @@ parabolaiso_mount_handler() {
local newroot="${1}"
if ! mountpoint -q "/run/parabolaiso/bootmnt"; then
- _mnt_dev "${parabolaisodevice}" "/run/parabolaiso/bootmnt" "-r"
+ _mnt_dev "${parabolaisodevice}" "/run/parabolaiso/bootmnt" "-r" "defaults"
if [[ "${copytoram}" != "y" ]]; then
echo $(readlink -f ${parabolaisodevice}) >> /run/parabolaiso/used_block_devices
fi
fi
-
- if [[ ! -f "${aitab}" ]]; then
- echo "ERROR: '${aitab}' file does not exist."
- echo " Falling back to interactive prompt"
- echo " You can try to fix the problem manually, log out when you are finished"
- launch_interactive_shell
- fi
-
if [[ "${checksum}" == "y" ]]; then
- if [[ -f "/run/parabolaiso/bootmnt/${parabolaisobasedir}/checksum.${arch}.md5" ]]; then
+ if [[ -f "/run/parabolaiso/bootmnt/${parabolaisobasedir}/${arch}/airootfs.sha512" ]]; then
msg -n ":: Self-test requested, please wait..."
if _verify_checksum; then
msg "done. Checksum is OK, continue booting."
else
echo "ERROR: one or more files are corrupted"
- echo "see /tmp/checksum.${arch}.log for details"
+ echo "see /tmp/checksum.log for details"
launch_interactive_shell
fi
else
- echo "ERROR: checksum=y option specified but checksum.${arch}.md5 not found"
+ echo "ERROR: checksum=y option specified but ${parabolaisobasedir}/${arch}/airootfs.sha512 not found"
+ launch_interactive_shell
+ fi
+ fi
+
+ if [[ "${verify}" == "y" ]]; then
+ if [[ -f "/run/parabolaiso/bootmnt/${parabolaisobasedir}/${arch}/airootfs.sfs.sig" ]]; then
+ msg -n ":: Signature verification requested, please wait..."
+ if _verify_signature; then
+ msg "done. Signature is OK, continue booting."
+ else
+ echo "ERROR: one or more files are corrupted"
+ launch_interactive_shell
+ fi
+ else
+ echo "ERROR: verify=y option specified but ${parabolaisobasedir}/${arch}/airootfs.sfs.sig not found"
launch_interactive_shell
fi
fi
@@ -178,30 +190,25 @@ parabolaiso_mount_handler() {
fi
if [[ -n "${cow_device}" ]]; then
- _mnt_dev "${cow_device}" "/run/parabolaiso/cowspace" "-r"
+ _mnt_dev "${cow_device}" "/run/parabolaiso/cowspace" "-r" "${cow_flags}"
echo $(readlink -f ${cow_device}) >> /run/parabolaiso/used_block_devices
mount -o remount,rw "/run/parabolaiso/cowspace"
else
- msg ":: Mounting /run/parabolaiso/cowspace (tmpfs) filesystem, size=${cowspace_size}..."
+ msg ":: Mounting /run/parabolaiso/cowspace (tmpfs) filesystem, size=${cow_spacesize}..."
mkdir -p /run/parabolaiso/cowspace
- mount -t tmpfs -o "size=${cowspace_size}",mode=0755 cowspace /run/parabolaiso/cowspace
+ mount -t tmpfs -o "size=${cow_spacesize}",mode=0755 cowspace /run/parabolaiso/cowspace
+ fi
+ mkdir -p -m 0700 "/run/parabolaiso/cowspace/${cow_directory}"
+
+ _mnt_sfs "/run/parabolaiso/bootmnt/${parabolaisobasedir}/${arch}/airootfs.sfs" "/run/parabolaiso/sfs/airootfs"
+ if [[ -f "/run/parabolaiso/sfs/airootfs/airootfs.img" ]]; then
+ _mnt_dmsnapshot "/run/parabolaiso/sfs/airootfs/airootfs.img" "${newroot}" "/"
+ else
+ _mnt_overlayfs "/run/parabolaiso/sfs/airootfs" "${newroot}" "/"
fi
- mkdir -p "/run/parabolaiso/cowspace/${cow_directory}"
-
- local aitab_img aitab_mnt aitab_arch aitab_sfs_comp aitab_fs_type aitab_fs_size
- while read aitab_img aitab_mnt aitab_arch aitab_sfs_comp aitab_fs_type aitab_fs_size; do
- [[ "${aitab_img#\#}" != "${aitab_img}" ]] && continue
- [[ "${aitab_arch}" != "any" && "${aitab_arch}" != "${arch}" ]] && continue
- if [[ "${aitab_fs_type}" != "none" ]]; then
- _mnt_sfs "/run/parabolaiso/bootmnt/${parabolaisobasedir}/${aitab_arch}/${aitab_img}.fs.sfs" "/run/parabolaiso/sfs/${aitab_img}"
- _mnt_fs "/run/parabolaiso/sfs/${aitab_img}/${aitab_img}.fs" "${newroot}" "${aitab_mnt}"
- else
- _mnt_sfs "/run/parabolaiso/bootmnt/${parabolaisobasedir}/${aitab_arch}/${aitab_img}.sfs" "${newroot}${aitab_mnt}"
- fi
- done < "${aitab}"
if [[ "${copytoram}" == "y" ]]; then
- umount /run/parabolaiso/bootmnt
+ umount -d /run/parabolaiso/bootmnt
fi
}
diff --git a/parabolaiso/initcpio/hooks/parabolaiso_loop_mnt b/parabolaiso/initcpio/hooks/parabolaiso_loop_mnt
index 772c3b6..1a8783d 100644
--- a/parabolaiso/initcpio/hooks/parabolaiso_loop_mnt
+++ b/parabolaiso/initcpio/hooks/parabolaiso_loop_mnt
@@ -2,6 +2,7 @@
run_hook () {
[[ -n "${img_label}" ]] && img_dev="/dev/disk/by-label/${img_label}"
+ [[ -z "${img_flags}" ]] && img_flags="defaults"
if [[ -n "${img_dev}" && -n "${img_loop}" ]]; then
mount_handler="parabolaiso_loop_mount_handler"
fi
@@ -13,12 +14,14 @@ parabolaiso_loop_mount_handler () {
local _dev_loop
msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}"
- _mnt_dev "${img_dev}" "/run/parabolaiso/img_dev" "-r"
+ _mnt_dev "${img_dev}" "/run/parabolaiso/img_dev" "-r" "${img_flags}"
if [[ "${copytoram}" != "y" ]]; then
echo $(readlink -f ${img_dev}) >> /run/parabolaiso/used_block_devices
fi
- if ! _dev_loop=$(losetup --find --show --read-only "/run/parabolaiso/img_dev/${img_loop}"); then
+ if _dev_loop=$(losetup --find --show --read-only "/run/parabolaiso/img_dev/${img_loop}"); then
+ parabolaisodevice="${_dev_loop}"
+ else
echo "ERROR: Setting loopback device for file '/run/parabolaiso/img_dev/${img_loop}'"
launch_interactive_shell
fi
@@ -26,7 +29,7 @@ parabolaiso_loop_mount_handler () {
parabolaiso_mount_handler ${newroot}
if [[ "${copytoram}" == "y" ]]; then
- losetup -d ${_dev_loop}
+ losetup -d ${_dev_loop} 2>/dev/null
umount /run/parabolaiso/img_dev
fi
}
diff --git a/parabolaiso/initcpio/hooks/parabolaiso_pxe_common b/parabolaiso/initcpio/hooks/parabolaiso_pxe_common
index d8ac709..7c3b1b5 100644
--- a/parabolaiso/initcpio/hooks/parabolaiso_pxe_common
+++ b/parabolaiso/initcpio/hooks/parabolaiso_pxe_common
@@ -1,7 +1,8 @@
# vim: set ft=sh:
run_hook () {
- local i net_mac bootif_mac bootif_dev
+ # Do *not* declare 'bootif_dev' local! We need it in run_latehook().
+ local i net_mac bootif_mac
# These variables will be parsed from /tmp/net-*.conf generated by ipconfig
local DEVICE
local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1
@@ -21,11 +22,20 @@ run_hook () {
break
fi
done
- ip="${ip}::${bootif_dev}"
+ if [[ "${ip}" == "dhcp" ]]; then
+ ip=":::::${bootif_dev}:dhcp"
+ else
+ ip="${ip}::${bootif_dev}"
+ fi
fi
# setup network and save some values
- ipconfig "ip=${ip}"
+ if ! ipconfig -t 20 "ip=${ip}"; then
+ echo "ERROR; Failed to configure network"
+ echo " Falling back to interactive prompt"
+ echo " You can try to fix the problem manually, log out when you are finished"
+ launch_interactive_shell
+ fi
. /tmp/net-*.conf
@@ -33,18 +43,30 @@ run_hook () {
# setup DNS resolver
if [[ "${IPV4DNS0}" != "0.0.0.0" ]]; then
- echo "nameserver ${IPV4DNS0}" > /etc/resolv.conf
+ echo "# added by parabolaiso_pxe_common hook" > /etc/resolv.conf
+ echo "nameserver ${IPV4DNS0}" >> /etc/resolv.conf
fi
if [[ "${IPV4DNS1}" != "0.0.0.0" ]]; then
echo "nameserver ${IPV4DNS1}" >> /etc/resolv.conf
fi
+ if [[ -n "${DNSDOMAIN}" ]]; then
+ echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
+ echo "domain ${DNSDOMAIN}" >> /etc/resolv.conf
+ fi
fi
}
run_latehook () {
- [[ -z "${copy_resolvconf}" ]] && copy_resolvconf="y"
+ if [[ -n "${ip}" ]]; then
+ [[ -z "${copy_resolvconf}" ]] && copy_resolvconf="y"
- if [[ "${copy_resolvconf}" != "n" && -f /etc/resolv.conf ]]; then
- cp /etc/resolv.conf /new_root/etc/resolv.conf
+ if [[ "${copytoram}" == "y" ]]; then
+ if [[ -n "${bootif_dev}" ]]; then
+ ip addr flush dev "${bootif_dev}"
+ ip link set "${bootif_dev}" down
+ fi
+ elif [[ "${copy_resolvconf}" != "n" && -f /etc/resolv.conf ]]; then
+ cp /etc/resolv.conf /new_root/etc/resolv.conf
+ fi
fi
}
diff --git a/parabolaiso/initcpio/hooks/parabolaiso_pxe_http b/parabolaiso/initcpio/hooks/parabolaiso_pxe_http
index 97de91f..b3440ed 100644
--- a/parabolaiso/initcpio/hooks/parabolaiso_pxe_http
+++ b/parabolaiso/initcpio/hooks/parabolaiso_pxe_http
@@ -3,6 +3,10 @@
run_hook() {
if [[ -n "${ip}" && -n "${parabolaiso_http_srv}" ]]; then
+ # booting with http is always copy-to-ram, so set here to make sure
+ # addresses are flushed and interface is set down
+ copytoram="y"
+
parabolaiso_http_srv=$(eval echo ${parabolaiso_http_srv})
[[ -z "${parabolaiso_http_spc}" ]] && parabolaiso_http_spc="75%"
@@ -34,24 +38,13 @@ parabolaiso_pxe_http_mount_handler () {
mkdir -p "/run/parabolaiso/httpspace"
mount -t tmpfs -o size="${parabolaiso_http_spc}",mode=0755 httpspace "/run/parabolaiso/httpspace"
- local _aitab_url="${parabolaiso_http_srv}${aitab#/run/parabolaiso/bootmnt/}"
- local _aitab_file="/run/parabolaiso/httpspace/${aitab#/run/parabolaiso/bootmnt/}"
-
- _curl_get "${_aitab_url}" "/"
-
- local aitab_img aitab_mnt aitab_arch aitab_sfs_comp aitab_fs_type aitab_fs_size
- while read aitab_img aitab_mnt aitab_arch aitab_sfs_comp aitab_fs_type aitab_fs_size; do
- [[ "${aitab_img#\#}" != "${aitab_img}" ]] && continue
- [[ "${aitab_arch}" != "any" && "${aitab_arch}" != "${arch}" ]] && continue
- if [[ "${aitab_fs_type}" != "none" ]]; then
- _curl_get "${parabolaiso_http_srv}${parabolaisobasedir}/${aitab_arch}/${aitab_img}.fs.sfs" "/${aitab_arch}"
- else
- _curl_get "${parabolaiso_http_srv}${parabolaisobasedir}/${aitab_arch}/${aitab_img}.sfs" "/${aitab_arch}"
- fi
- done < "${_aitab_file}"
+ _curl_get "${parabolaiso_http_srv}${parabolaisobasedir}/${arch}/airootfs.sfs" "/${arch}"
if [[ "${checksum}" == "y" ]]; then
- _curl_get "${parabolaiso_http_srv}${parabolaisobasedir}/checksum.${arch}.md5" "/"
+ _curl_get "${parabolaiso_http_srv}${parabolaisobasedir}/${arch}/airootfs.sha512" "/${arch}"
+ fi
+ if [[ "${verify}" == "y" ]]; then
+ _curl_get "${parabolaiso_http_srv}${parabolaisobasedir}/${arch}/airootfs.sfs.sig" "/${arch}"
fi
mkdir -p "/run/parabolaiso/bootmnt"
diff --git a/parabolaiso/initcpio/hooks/parabolaiso_pxe_nbd b/parabolaiso/initcpio/hooks/parabolaiso_pxe_nbd
index 1bb8cbb..1991f80 100644
--- a/parabolaiso/initcpio/hooks/parabolaiso_pxe_nbd
+++ b/parabolaiso/initcpio/hooks/parabolaiso_pxe_nbd
@@ -1,5 +1,12 @@
# vim: set ft=sh:
+run_earlyhook() {
+ if [[ -n "${ip}" && -n "${parabolaiso_nbd_srv}" ]]; then
+ # Module autoloading like with loop devices does not work, doing manually...
+ modprobe nbd 2> /dev/null
+ fi
+}
+
run_hook() {
if [[ -n "${ip}" && -n "${parabolaiso_nbd_srv}" ]]; then
@@ -13,9 +20,6 @@ run_hook() {
parabolaiso_pxe_nbd_mount_handler () {
newroot="${1}"
- # Module autoloading like with loop devices does not work, doing manually...
- modprobe nbd 2> /dev/null
-
msg ":: Waiting for boot device..."
while ! poll_device /dev/nbd0 30; do
echo "ERROR: boot device didn't show up after 30 seconds..."
@@ -25,16 +29,19 @@ parabolaiso_pxe_nbd_mount_handler () {
done
msg ":: Setup NBD from ${parabolaiso_nbd_srv} at /dev/nbd0"
- nbd-client ${parabolaiso_nbd_srv} -N ${parabolaiso_nbd_name} /dev/nbd0
-
if [[ "${copytoram}" != "n" ]]; then
+ nbd-client ${parabolaiso_nbd_srv} -N ${parabolaiso_nbd_name} /dev/nbd0
copytoram="y"
+ else
+ nbd-client ${parabolaiso_nbd_srv} -N ${parabolaiso_nbd_name} -systemd-mark -persist /dev/nbd0
fi
parabolaisodevice=/dev/nbd0
parabolaiso_mount_handler ${newroot}
- msg ":: Disconnect NBD from ${parabolaiso_nbd_srv} at /dev/nbd0"
- nbd-client -d /dev/nbd0
+ if [[ "${copytoram}" == "y" ]]; then
+ msg ":: Disconnect NBD from ${parabolaiso_nbd_srv} at /dev/nbd0"
+ nbd-client -d /dev/nbd0
+ fi
}
diff --git a/parabolaiso/initcpio/install/parabolaiso b/parabolaiso/initcpio/install/parabolaiso
index 8893667..30728ef 100644
--- a/parabolaiso/initcpio/install/parabolaiso
+++ b/parabolaiso/initcpio/install/parabolaiso
@@ -4,6 +4,7 @@ build() {
add_module "cdrom"
add_module "loop"
add_module "dm-snapshot"
+ add_module "overlay"
add_runscript
@@ -12,11 +13,18 @@ build() {
add_binary dmsetup
add_binary losetup
add_binary mountpoint
+ add_binary truncate
+ add_binary gpg
+ add_binary grep
add_file /usr/lib/udev/rules.d/60-cdrom_id.rules
add_file /usr/lib/udev/rules.d/10-dm.rules
add_file /usr/lib/udev/rules.d/95-dm-notify.rules
add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules
+ if [[ $ARCHISO_GNUPG_FD ]]; then
+ mkdir -p "$BUILDROOT$dest"/gpg
+ gpg --homedir "$BUILDROOT$dest"/gpg --import <&$ARCHISO_GNUPG_FD
+ fi
}
# vim: set ft=sh ts=4 sw=4 et:
diff --git a/parabolaiso/initcpio/install/parabolaiso_pxe_http b/parabolaiso/initcpio/install/parabolaiso_pxe_http
index 4e02f98..9ce9726 100644
--- a/parabolaiso/initcpio/install/parabolaiso_pxe_http
+++ b/parabolaiso/initcpio/install/parabolaiso_pxe_http
@@ -4,6 +4,8 @@ build() {
add_runscript
add_binary curl
+
+ add_file $(readlink -f /etc/ssl/certs/ca-certificates.crt) /etc/ssl/certs/ca-certificates.crt
}
help() {