diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-09-13 22:03:41 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-09-13 22:03:41 -0300 |
| commit | 6e25655ba204eda4f11460355199bd121889ad04 (patch) | |
| tree | f490653e3d4c5b833b761a7c5f1557cca7d31626 /configs/releng | |
| parent | b11fa2ad388eaaa3776a3d3c99fb30d6ddb111b0 (diff) | |
Rebranding
Diffstat (limited to 'configs/releng')
| -rwxr-xr-x | configs/releng/build.sh | 9 | ||||
| -rw-r--r-- | configs/releng/pacman.conf | 1 | ||||
| -rwxr-xr-x | configs/releng/root-image/etc/rc.d/pacman-init | 2 | ||||
| -rw-r--r-- | configs/releng/root-image/root/install.txt | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 8d71d75..b9197c4 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -78,11 +78,11 @@ make_boot_efi() { mkdir -p ${work_dir}/efiboot/EFI/archiso cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/archiso/vmlinuz.efi - cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/archiso/archiso.img + cp ${work_dir}/iso/${install_dir}/boot/x86_64/libreiso.img ${work_dir}/efiboot/EFI/archiso/libreiso.img # There are plans to support command line options via a config file (not yet in linux-3.3) #cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/boot/bootx64.efi - #cp ${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img ${work_dir}/efiboot/EFI/boot/linux.img + #cp ${work_dir}/iso/${install_dir}/boot/x86_64/libreiso.img ${work_dir}/efiboot/EFI/boot/linux.img #echo "archisolabel=${iso_label} initrd=\EFI\boot\linux.img" | iconv -f ascii -t ucs2 > ${work_dir}/iso/EFI/boot/linux.conf # For now, provide an EFI-shell until 'linux.conf' hits mainline. @@ -151,9 +151,8 @@ make_customize_root_image() { chmod 750 ${work_dir}/root-image/etc/sudoers.d chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel mkdir -p ${work_dir}/root-image/etc/pacman.d - wget -O ${work_dir}/root-image/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on' - lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/root-image/root/install.txt - sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist + echo 'Server = http://repo.parabolagnulinux.org/$repo/os/$arch' > ${work_dir}/root-image/etc/pacman.d/mirrorlist + lynx -dump -nolist 'https://wiki.parabolagnulinux.org/Installation_Guide?action=render' >> ${work_dir}/root-image/root/install.txt patch ${work_dir}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch sed -i 's/#\(en_US\.UTF-8\)/\1/' ${work_dir}/root-image/etc/locale.gen mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ diff --git a/configs/releng/pacman.conf b/configs/releng/pacman.conf index 821f9a5..bd04545 100644 --- a/configs/releng/pacman.conf +++ b/configs/releng/pacman.conf @@ -44,6 +44,7 @@ Architecture = auto # NOTE: You must run `pacman-key --init` before first using pacman; the local # keyring can then be populated with the keys of all official Arch Linux # packagers with `pacman-key --populate archlinux`. +# Also add the Parabola packagers keys `pacman-key --populate parabola` # # REPOSITORIES diff --git a/configs/releng/root-image/etc/rc.d/pacman-init b/configs/releng/root-image/etc/rc.d/pacman-init index bbbd719..596fe30 100755 --- a/configs/releng/root-image/etc/rc.d/pacman-init +++ b/configs/releng/root-image/etc/rc.d/pacman-init @@ -6,7 +6,7 @@ case "$1" in start) stat_busy "Initializing pacman keyring" - if { pacman-key --init && pacman-key --populate archlinux; } &>/dev/null; then + if { pacman-key --init && pacman-key --populate archlinux && pacman-key --populate parabola; } &>/dev/null; then add_daemon pacman-init stat_done else diff --git a/configs/releng/root-image/root/install.txt b/configs/releng/root-image/root/install.txt index 3c8f171..e1f57ad 100644 --- a/configs/releng/root-image/root/install.txt +++ b/configs/releng/root-image/root/install.txt @@ -1,3 +1,3 @@ View this installation guide online at -https://wiki.archlinux.org/index.php/Installation_Guide +https://wiki.parabolagnulinux.org/Installation_Guide |