From da2df60755788c6929b2b94cf510b05e7bd7d2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Fri, 25 Feb 2011 18:04:04 -0300 Subject: Parabola 2011.02.25 Release --- Makefile | 14 ++++++++++---- boot-files/releasenotes.txt | 2 +- overlay/arch/setup | 3 --- overlay/etc/motd | 8 ++------ overlay/etc/pacman.d/mirrorlist | 4 ++++ overlay/etc/rc.conf | 4 ++-- overlay/libre/report-issues | 1 + overlay/libre/setup | 3 +++ packages.i686 | 4 ++-- packages.x86_64 | 4 ++-- 10 files changed, 27 insertions(+), 20 deletions(-) delete mode 100755 overlay/arch/setup create mode 100644 overlay/etc/pacman.d/mirrorlist create mode 100644 overlay/libre/report-issues create mode 100755 overlay/libre/setup diff --git a/Makefile b/Makefile index 509a93e..77505c6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,11 @@ ver=$(shell date +%Y.%m.%d) +# mkarchiso flags +LABEL="Parabola" +PUBLISHER="Parabola Project" +APPLICATION="Parabola Live Medium" +PACCONFIG="overlay/etc/pacman.conf" + WORKDIR=work INSTALL_DIR=arch COMPRESS=gzip @@ -21,9 +27,9 @@ core-iso: $(COREname) net-iso: $(NETname) $(COREname): core-pkgs base-fs - mkarchiso -v -D $(INSTALL_DIR) -c $(COMPRESS) iso $(WORKDIR) $@ + mkarchiso -v -L $(LABEL) -P $(PUBLISHER) -A $(APPLICATION) -D $(INSTALL_DIR) -c $(COMPRESS) iso $(WORKDIR) $@ $(NETname): base-fs - mkarchiso -v -D $(INSTALL_DIR) -c $(COMPRESS) iso $(WORKDIR) $@ + mkarchiso -v -L $(LABEL) -P $(PUBLISHER) -A $(APPLICATION) -D $(INSTALL_DIR) -c $(COMPRESS) iso $(WORKDIR) $@ # This is the main rule for make the working filesystem. base-fs: root-image bootfiles initcpio overlay iso-mounts @@ -32,8 +38,8 @@ base-fs: root-image bootfiles initcpio overlay iso-mounts # Rules for make the root-image for base filesystem. root-image: $(WORKDIR)/root-image/.arch-chroot $(WORKDIR)/root-image/.arch-chroot: - mkarchiso -v -D $(INSTALL_DIR) -p base create $(WORKDIR) - mkarchiso -v -D $(INSTALL_DIR) -p $(PACKAGES) create $(WORKDIR) + mkarchiso -v -L $(LABEL) -P $(PUBLISHER) -A $(APPLICATION) -D $(INSTALL_DIR) -p base create $(WORKDIR) + mkarchiso -v -L $(LABEL) -P $(PUBLISHER) -A $(APPLICATION) -D $(INSTALL_DIR) -p $(PACKAGES) create $(WORKDIR) # Rule for make /boot bootfiles: root-image diff --git a/boot-files/releasenotes.txt b/boot-files/releasenotes.txt index 1c2e057..9a62275 100644 --- a/boot-files/releasenotes.txt +++ b/boot-files/releasenotes.txt @@ -1,3 +1,3 @@ -Arch Linux Live Medium +Parabola GNU/Linux-Libre Live Medium Release Notes -------------------------- diff --git a/overlay/arch/setup b/overlay/arch/setup deleted file mode 100755 index 908d106..0000000 --- a/overlay/arch/setup +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# -aif -p interactive -d -l diff --git a/overlay/etc/motd b/overlay/etc/motd index ddd9fbc..af615af 100644 --- a/overlay/etc/motd +++ b/overlay/etc/motd @@ -1,5 +1,5 @@ ************************************************************** -* To begin installation, run /arch/setup * +* To begin installation, run /libre/setup * * You can find documentation at * * /usr/share/aif/docs/official_installation_guide_en * * * @@ -7,10 +7,6 @@ * and console font. * * * * If you encounter issues and want to report them or * -* seek help, run /arch/report-issues * -* * -* If you are looking to install Arch on something more * -* exotic, such as your kerosene-powered cheese grater, * -* please consult http://wiki.archlinux.org. * +* seek help, run /libre/report-issues * * * ************************************************************** diff --git a/overlay/etc/pacman.d/mirrorlist b/overlay/etc/pacman.d/mirrorlist new file mode 100644 index 0000000..6537e4c --- /dev/null +++ b/overlay/etc/pacman.d/mirrorlist @@ -0,0 +1,4 @@ +# Parabola GNU/Linux +Server = http://parabolagnulinux.org/repo/$repo/os/$arch +Server = ftp://ftp.inf.utfsm.cl/pub/parabola/$repo/os/$arch + diff --git a/overlay/etc/rc.conf b/overlay/etc/rc.conf index ff18456..3893268 100644 --- a/overlay/etc/rc.conf +++ b/overlay/etc/rc.conf @@ -1,5 +1,5 @@ # -# /etc/rc.conf - Main Configuration for Arch Linux +# /etc/rc.conf - Main Configuration for Parabola GNU/Linux-Libre . /etc/archiso/functions @@ -18,7 +18,7 @@ USECOLOR="yes" MOD_AUTOLOAD="yes" -HOSTNAME="archiso" +HOSTNAME="libreiso" #TODO add more auto-daemons here, especially the live-cd specific stuff DAEMONS=(syslog-ng network archiso) diff --git a/overlay/libre/report-issues b/overlay/libre/report-issues new file mode 100644 index 0000000..bf3b3a3 --- /dev/null +++ b/overlay/libre/report-issues @@ -0,0 +1 @@ +aif-report-issues.sh diff --git a/overlay/libre/setup b/overlay/libre/setup new file mode 100755 index 0000000..908d106 --- /dev/null +++ b/overlay/libre/setup @@ -0,0 +1,3 @@ +#!/bin/sh +# +aif -p interactive -d -l diff --git a/packages.i686 b/packages.i686 index 1fab424..432f155 100644 --- a/packages.i686 +++ b/packages.i686 @@ -1,5 +1,5 @@ -aif -aufs2 +aif-libre +aufs2-libre aufs2-util btrfs-progs-unstable crda diff --git a/packages.x86_64 b/packages.x86_64 index 1fab424..432f155 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -1,5 +1,5 @@ -aif -aufs2 +aif-libre +aufs2-libre aufs2-util btrfs-progs-unstable crda -- cgit v1.2.3