diff options
| author | Juan RP <xtraeme@gmail.com> | 2014-06-25 06:53:30 +0200 |
|---|---|---|
| committer | Juan RP <xtraeme@gmail.com> | 2014-06-25 06:53:30 +0200 |
| commit | ddbf495c4cbbb92c51dcda69f0f6a48ba5923057 (patch) | |
| tree | 4ffa9f8f7d115a1df764dae63c480aa7c819b491 | |
| parent | b54cdb22e756b35b5cc3a2712ae8f7dae2c1c228 (diff) | |
| download | hrmpf-ddbf495c4cbbb92c51dcda69f0f6a48ba5923057.tar.gz hrmpf-ddbf495c4cbbb92c51dcda69f0f6a48ba5923057.tar.xz hrmpf-ddbf495c4cbbb92c51dcda69f0f6a48ba5923057.zip | |
mklive: two fixes to generate images on any linux distro.
- Store and use default void rsa pubkey for the xbps repos. - If -r is unset, use default void main http repo.
| -rw-r--r-- | keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist | 12 | ||||
| -rw-r--r-- | mklive.sh.in | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist b/keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist new file mode 100644 index 0000000..c1e82a7 --- /dev/null +++ b/keys/60:ae:0c:d6:f0:95:17:80:bc:93:46:7a:89:af:a3:2d.plist @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>public-key</key> + <data>LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUF2clN6QlpNdmd2T0NJM0FYYk9qYQoycktSa0pTVE0zYy9FalRJZ0NnRFhndW05M0JQQ3RZOE1jRlZvQ1U0T2lYSEdmVG1xMzlCVk5wTHZMSEw5S2sxCnAyNzhTQmhYVk90YkIyRVZtREtudmZJREVUbGRMR3plN3JaTlJKZHR1TjJtWi9UVnJVQjlTMHlRYytJdWY0aHYKMytEOTdWSWRUSkhBN0FTcjA0MjhwcEVHSkd3U1NoWTJYSm05RDVJMEV1R1JXYzE0TUVHN2RJS0ppWWlNMG5FNAp0WW8yL3ZINElGVEhkblZBM2dZaVp5RG5idUNBUi84RVNmVVRVMTNTTkNPZGJ1ZGYzRDVCY3krVWlNREpJM1llCjRNRktCclQ5WmhaK0dzWEJaWTQ4MmxxaVppNkNMNXB0YzlJUUZmOC9lS1phOGphdGtpVkZWZ3JLZU5Sak9UeE4KZldTdTJua3hHTlgrYmhYWXRoaUdXbUpFWThjQ0FQeUZOK0x2NVJldEsyNTZnZGNiMnNrbUVxZWZ2MnpQQyt3VgpXQmJkSDViRDRiWmpuME42Wmw4MXJ2NVJ6RHZudmYrdkQxNGFGVWJaOFFGcXU3NVBiTDR3Nm1ZTTRsZE0vZzBSCjZOWEU4QXo5Qnd4MnREZlllS3V1dHcxRXBQbTJZdkZ5VFViMWNveUF1VEdSeUFhcDFVVEh2ZzlsaFBJSm1oRlEKSjVrQ2cxcUQ3QTMxV2wwUmxuZTZoZ0dvMFpaTko1Y0pNL3YvelNUS0pjdUZnd283SDBoT0dpbDZEZm84OUI0agpHOTZBQ3lQUytEVktQRlhSWXdqL0FrYkhwYVEyZjFGTUFvU3BCcXVEcUhoM3VrazcxS1g2ajE5dDBpRjhEUUxyCnZ0RlNTZElqREEwMmx3ZVY5TmFRcFdzQ0F3RUFBUT09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=</data> + <key>public-key-size</key> + <integer>4096</integer> + <key>signature-by</key> + <string>Void Linux</string> +</dict> +</plist> diff --git a/mklive.sh.in b/mklive.sh.in index 5bbf80e..c31768c 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -90,7 +90,7 @@ _EOF copy_void_keys() { if [ ! -d "$1"/var/db/xbps/keys ]; then mkdir -p "$1"/var/db/xbps/keys - cp /var/db/xbps/keys/*.plist "$1"/var/db/xbps/keys + cp keys/*.plist "$1"/var/db/xbps/keys fi } @@ -286,6 +286,7 @@ ISOLINUX_DIR="$BOOT_DIR/isolinux" GRUB_DIR="$BOOT_DIR/grub" ISOLINUX_CFG="$ISOLINUX_DIR/isolinux.cfg" +: ${XBPS_REPOSITORY:=--repository=http://repo.voidlinux.eu/current} : ${SYSLINUX_DATADIR:=$VOIDHOSTDIR/usr/share/syslinux} : ${SPLASH_IMAGE:=splash.png} : ${XBPS_INSTALL_CMD:=xbps-install} @@ -310,7 +311,7 @@ info_msg "Redirecting stdout/stderr to $LOGFILE ..." info_msg "[1/9] Synchronizing XBPS repository data..." # Sync index for remote repos first. copy_void_keys $ROOTFS -$XBPS_INSTALL_CMD -r $ROOTFS ${XBPS_REPOSITORY} -S >/dev/null 2>&1 +$XBPS_INSTALL_CMD -r $ROOTFS ${XBPS_REPOSITORY} -S cp -a $ROOTFS/* $VOIDHOSTDIR _linux_series=$($XBPS_QUERY_CMD -r $ROOTFS ${XBPS_REPOSITORY:=-R} -x linux) |