summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-09-13 22:03:41 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-09-13 22:03:41 -0300
commit6e25655ba204eda4f11460355199bd121889ad04 (patch)
treef490653e3d4c5b833b761a7c5f1557cca7d31626
parentb11fa2ad388eaaa3776a3d3c99fb30d6ddb111b0 (diff)
Rebranding
-rw-r--r--README32
-rwxr-xr-xconfigs/releng/build.sh9
-rw-r--r--configs/releng/pacman.conf1
-rwxr-xr-xconfigs/releng/root-image/etc/rc.d/pacman-init2
-rw-r--r--configs/releng/root-image/root/install.txt2
5 files changed, 23 insertions, 23 deletions
diff --git a/README b/README
index 5940898..e1d80e3 100644
--- a/README
+++ b/README
@@ -149,7 +149,7 @@ This is a rebranded fork of the original Archiso for Parabola GNU/Linux-libre.
*** Transfer ISO image to target medium (configs/releng)
-ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+ISO images names consist of: parabola-<YYYY>.<MM>.<DD>-<ARCH>.iso
Where:
<YYYY> Year
@@ -173,7 +173,7 @@ Nomeclature:
1) Write it directly using your favorite recording program.
-# cdrecord dev=<B>,<T>,<L> -dao archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+# cdrecord dev=<B>,<T>,<L> -dao parabola-<YYYY>.<MM>.<DD>-<ARCH>.iso
** To -> USB Flash Drive (USB-key) / Memory card (SD) /
@@ -192,10 +192,10 @@ Nomeclature:
(example: /dev/sdx1)
<MNT-TARGET-N>: Mount point path where <DEV-TARGET-N> is mounted
(example: /mnt/sdx/1)
-<ISO-SOURCE>: Path to the ISO file archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
- (example: ~/archlinux-2012.07.22-x86_64.iso)
+<ISO-SOURCE>: Path to the ISO file parabola-<YYYY>.<MM>.<DD>-<ARCH>.iso
+ (example: ~/parabola-2012.07.22-x86_64.iso)
<FS-LABEL>: Represents the filesystem label of the <ISO-SOURCE>
- (example: ARCH_201207 [for all ~/archlinux-2012.07.*.iso])
+ (example: ARCH_201207 [for all ~/parabola-2012.07.*.iso])
* PC-BIOS (MBR):
@@ -271,22 +271,22 @@ Note: Using here a GPT partition mode as example, but MBR should also works
** ISO in loopback mode.
Note: Described method is for using with GRUB2.
- GRUB2 is installed on target media and archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+ GRUB2 is installed on target media and parabola-<YYYY>.<MM>.<DD>-<ARCH>.iso
is at path <TARGET-PATH> on disk <D> and partition <P>,
where filesystem is labeled as <TARGET-FS-LABEL>.
-menuentry "Arch Linux (x86_64)" {
- set isofile="/<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso"
+menuentry "Parabola (x86_64)" {
+ set isofile="/<TARGET-PATH>/parabola-<YYYY>.<MM>.<DD>-<ARCH>.iso"
loopback loop (hd<D>,<P>)$isofile
linux (loop)/arch/boot/x86_64/vmlinuz archisolabel=<FS-LABEL> img_label=<TARGET-FS-LABEL> img_loop=$isofile
- initrd (loop)/arch/boot/x86_64/archiso.img
+ initrd (loop)/arch/boot/x86_64/libreiso.img
}
-menuentry "Arch Linux (i686)" {
- set isofile="/<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso"
+menuentry "Parabola (i686)" {
+ set isofile="/<TARGET-PATH>/parabola-<YYYY>.<MM>.<DD>-<ARCH>.iso"
loopback loop (hd<D>,<P>)$isofile
linux (loop)/arch/boot/i686/vmlinuz archisolabel=<FS-LABEL> img_label=<TARGET-FS-LABEL> img_loop=$isofile
- initrd (loop)/arch/boot/i686/archiso.img
+ initrd (loop)/arch/boot/i686/libreiso.img
}
@@ -294,7 +294,7 @@ menuentry "Arch Linux (i686)" {
Note: Described method is for using with SYSLINUX. Anyway MEMDISK from SYSLINUX can work
with other bootloaders.
- SYSLINUX is installed on target media and archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+ SYSLINUX is installed on target media and parabola-<YYYY>.<MM>.<DD>-<ARCH>.iso
is at path <TARGET-PATH>.
On 32-bit systems, is needed to pass vmalloc=nnM to the kernel, where nn is the size
of the ISO image plus 64 MiB (or 128 MiB).
@@ -302,12 +302,12 @@ Note: Described method is for using with SYSLINUX. Anyway MEMDISK from SYSLINUX
LABEL arch_x64
LINUX memdisk
- INITRD /<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+ INITRD /<TARGET-PATH>/parabola-<YYYY>.<MM>.<DD>-<ARCH>.iso
APPEND iso
LABEL arch_x32
LINUX memdisk
- INITRD /<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-<ARCH>.iso
+ INITRD /<TARGET-PATH>/parabola-<YYYY>.<MM>.<DD>-<ARCH>.iso
APPEND iso
@@ -453,7 +453,7 @@ When make your custom boot-pendrive, you need to copy /libre directory to it.
(A.K.A deinitramfs), build at initramfs by [archiso_shutdown] initcpio hook.
-*** Building the most basic Arch Linux live media. (configs/baseline)
+*** Building the most basic Parabola live media. (configs/baseline)
* Install needed packages.
# pacman -S git make squashfs-tools libisoburn rsync --needed
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