- Store and use default void rsa pubkey for the xbps repos. - If -r is unset, use default void main http repo.
Unified · Split
| @@ -0,0 +1,12 @@ | ||
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | |
| 3 | +<plist version="1.0"> | |
| 4 | +<dict> | |
| 5 | + <key>public-key</key> | |
| 6 | + <data>LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUF2clN6QlpNdmd2T0NJM0FYYk9qYQoycktSa0pTVE0zYy9FalRJZ0NnRFhndW05M0JQQ3RZOE1jRlZvQ1U0T2lYSEdmVG1xMzlCVk5wTHZMSEw5S2sxCnAyNzhTQmhYVk90YkIyRVZtREtudmZJREVUbGRMR3plN3JaTlJKZHR1TjJtWi9UVnJVQjlTMHlRYytJdWY0aHYKMytEOTdWSWRUSkhBN0FTcjA0MjhwcEVHSkd3U1NoWTJYSm05RDVJMEV1R1JXYzE0TUVHN2RJS0ppWWlNMG5FNAp0WW8yL3ZINElGVEhkblZBM2dZaVp5RG5idUNBUi84RVNmVVRVMTNTTkNPZGJ1ZGYzRDVCY3krVWlNREpJM1llCjRNRktCclQ5WmhaK0dzWEJaWTQ4MmxxaVppNkNMNXB0YzlJUUZmOC9lS1phOGphdGtpVkZWZ3JLZU5Sak9UeE4KZldTdTJua3hHTlgrYmhYWXRoaUdXbUpFWThjQ0FQeUZOK0x2NVJldEsyNTZnZGNiMnNrbUVxZWZ2MnpQQyt3VgpXQmJkSDViRDRiWmpuME42Wmw4MXJ2NVJ6RHZudmYrdkQxNGFGVWJaOFFGcXU3NVBiTDR3Nm1ZTTRsZE0vZzBSCjZOWEU4QXo5Qnd4MnREZlllS3V1dHcxRXBQbTJZdkZ5VFViMWNveUF1VEdSeUFhcDFVVEh2ZzlsaFBJSm1oRlEKSjVrQ2cxcUQ3QTMxV2wwUmxuZTZoZ0dvMFpaTko1Y0pNL3YvelNUS0pjdUZnd283SDBoT0dpbDZEZm84OUI0agpHOTZBQ3lQUytEVktQRlhSWXdqL0FrYkhwYVEyZjFGTUFvU3BCcXVEcUhoM3VrazcxS1g2ajE5dDBpRjhEUUxyCnZ0RlNTZElqREEwMmx3ZVY5TmFRcFdzQ0F3RUFBUT09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=</data> | |
| 7 | + <key>public-key-size</key> | |
| 8 | + <integer>4096</integer> | |
| 9 | + <key>signature-by</key> | |
| 10 | + <string>Void Linux</string> | |
| 11 | +</dict> | |
| 12 | +</plist> | |
| @@ -90,7 +90,7 @@ _EOF · 89 unmodified lines | ||
| 90 | 90 | copy_void_keys() { |
| 91 | 91 | if [ ! -d "$1"/var/db/xbps/keys ]; then |
| 92 | 92 | mkdir -p "$1"/var/db/xbps/keys |
| 93 | − cp /var/db/xbps/keys/*.plist "$1"/var/db/xbps/keys | |
| 93 | + cp keys/*.plist "$1"/var/db/xbps/keys | |
| 94 | 94 | fi |
| 95 | 95 | } |
| 96 | 96 | |
| @@ -286,6 +286,7 @@ ISOLINUX_DIR="$BOOT_DIR/isolinux" · 189 unmodified lines | ||
| 286 | 286 | GRUB_DIR="$BOOT_DIR/grub" |
| 287 | 287 | ISOLINUX_CFG="$ISOLINUX_DIR/isolinux.cfg" |
| 288 | 288 | |
| 289 | +: ${XBPS_REPOSITORY:=--repository=http://repo.voidlinux.eu/current} | |
| 289 | 290 | : ${SYSLINUX_DATADIR:=$VOIDHOSTDIR/usr/share/syslinux} |
| 290 | 291 | : ${SPLASH_IMAGE:=splash.png} |
| 291 | 292 | : ${XBPS_INSTALL_CMD:=xbps-install} |
| @@ -310,7 +311,7 @@ info_msg "Redirecting stdout/stderr to $LOGFILE ..." · 18 unmodified lines | ||
| 310 | 311 | info_msg "[1/9] Synchronizing XBPS repository data..." |
| 311 | 312 | # Sync index for remote repos first. |
| 312 | 313 | copy_void_keys $ROOTFS |
| 313 | −$XBPS_INSTALL_CMD -r $ROOTFS ${XBPS_REPOSITORY} -S >/dev/null 2>&1 | |
| 314 | +$XBPS_INSTALL_CMD -r $ROOTFS ${XBPS_REPOSITORY} -S | |
| 314 | 315 | cp -a $ROOTFS/* $VOIDHOSTDIR |
| 315 | 316 | |
| 316 | 317 | _linux_series=$($XBPS_QUERY_CMD -r $ROOTFS ${XBPS_REPOSITORY:=-R} -x linux) |