Merge pull request #12 from install-logos/testing

v0.1.1 ISO build merge
install-logos · Mar 13, 2015 · e341d7d · e341d7d
2 parents d6db380 + e5a350a
commit e341d7d
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 28 deletions.
diff --git a/releng/build.sh b/releng/build.sh
@@ -2,7 +2,7 @@
 
 set -e -u
 
-iso_name=archlinux
+iso_name=logoslinux
 iso_label="ARCH_$(date +%Y%m)"
 iso_version=$(date +%Y.%m.%d)
 install_dir=arch

diff --git a/releng/packages.both b/releng/packages.both
@@ -3,7 +3,6 @@ arch-install-scripts
 b43-fwcutter
 btrfs-progs
 clonezilla
-compton
 crda
 darkhttpd
 ddrescue
@@ -76,7 +75,7 @@ wireless_tools
 wpa_actiond
 wvdial
 xl2tpd
-xorg-init
+xorg-xinit
 xorg-server
 xorg-server-utils
 zathura

diff --git a/releng/syslinux/archiso_head.cfg b/releng/syslinux/archiso_head.cfg
@@ -1,6 +1,6 @@
 SERIAL 0 38400
 UI boot/syslinux/vesamenu.c32
-MENU TITLE Arch Linux
+MENU TITLE Logos Linux
 MENU BACKGROUND boot/syslinux/splash.png
 
 MENU WIDTH 78

diff --git a/releng/syslinux/archiso_pxe32.cfg b/releng/syslinux/archiso_pxe32.cfg
@@ -1,31 +1,31 @@
 LABEL arch32_nbd
 TEXT HELP
-Boot the Arch Linux (i686) live medium (Using NBD).
-It allows you to install Arch Linux or perform system maintenance.
+Boot the Logos Linux (i686) live medium (Using NBD).
+It allows you to install Logos Linux or perform system maintenance.
 ENDTEXT
-MENU LABEL Boot Arch Linux (i686) (NBD)
+MENU LABEL Boot Logos Linux (i686) (NBD)
 LINUX boot/i686/vmlinuz
 INITRD boot/intel_ucode.img,boot/i686/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
 SYSAPPEND 3
 
 LABEL arch32_nfs
 TEXT HELP
-Boot the Arch Linux (i686) live medium (Using NFS).
-It allows you to install Arch Linux or perform system maintenance.
+Boot the Logos Linux (i686) live medium (Using NFS).
+It allows you to install Logos Linux or perform system maintenance.
 ENDTEXT
-MENU LABEL Boot Arch Linux (i686) (NFS)
+MENU LABEL Boot Logos Linux (i686) (NFS)
 LINUX boot/i686/vmlinuz
 INITRD boot/intel_ucode.img,boot/i686/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
 SYSAPPEND 3
 
 LABEL arch32_http
 TEXT HELP
-Boot the Arch Linux (i686) live medium (Using HTTP).
-It allows you to install Arch Linux or perform system maintenance.
+Boot the Logos Linux (i686) live medium (Using HTTP).
+It allows you to install Logos Linux or perform system maintenance.
 ENDTEXT
-MENU LABEL Boot Arch Linux (i686) (HTTP)
+MENU LABEL Boot Logos Linux (i686) (HTTP)
 LINUX boot/i686/vmlinuz
 INITRD boot/intel_ucode.img,boot/i686/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/

diff --git a/releng/syslinux/archiso_pxe64.cfg b/releng/syslinux/archiso_pxe64.cfg
@@ -1,31 +1,31 @@
 LABEL arch64_nbd
 TEXT HELP
-Boot the Arch Linux (x86_64) live medium (Using NBD).
-It allows you to install Arch Linux or perform system maintenance.
+Boot the Logos Linux (x86_64) live medium (Using NBD).
+It allows you to install Logos Linux or perform system maintenance.
 ENDTEXT
-MENU LABEL Boot Arch Linux (x86_64) (NBD)
+MENU LABEL Boot Logos Linux (x86_64) (NBD)
 LINUX boot/x86_64/vmlinuz
 INITRD boot/intel_ucode.img,boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
 SYSAPPEND 3
 
 LABEL arch64_nfs
 TEXT HELP
-Boot the Arch Linux (x86_64) live medium (Using NFS).
-It allows you to install Arch Linux or perform system maintenance.
+Boot the Logos Linux (x86_64) live medium (Using NFS).
+It allows you to install Logos Linux or perform system maintenance.
 ENDTEXT
-MENU LABEL Boot Arch Linux (x86_64) (NFS)
+MENU LABEL Boot Logos Linux (x86_64) (NFS)
 LINUX boot/x86_64/vmlinuz
 INITRD boot/intel_ucode.img,boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
 SYSAPPEND 3
 
 LABEL arch64_http
 TEXT HELP
-Boot the Arch Linux (x86_64) live medium (Using HTTP).
-It allows you to install Arch Linux or perform system maintenance.
+Boot the Logos Linux (x86_64) live medium (Using HTTP).
+It allows you to install Logos Linux or perform system maintenance.
 ENDTEXT
-MENU LABEL Boot Arch Linux (x86_64) (HTTP)
+MENU LABEL Boot Logos Linux (x86_64) (HTTP)
 LINUX boot/x86_64/vmlinuz
 INITRD boot/intel_ucode.img,boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/

diff --git a/releng/syslinux/archiso_sys32.cfg b/releng/syslinux/archiso_sys32.cfg
@@ -1,9 +1,9 @@
 LABEL arch32
 TEXT HELP
-Boot the Arch Linux (i686) live medium.
-It allows you to install Arch Linux or perform system maintenance.
+Boot the Logos Linux (i686) live medium.
+It allows you to install Logos Linux or perform system maintenance.
 ENDTEXT
-MENU LABEL Boot Arch Linux (i686)
+MENU LABEL Boot Logos Linux (i686)
 LINUX boot/i686/vmlinuz
 INITRD boot/intel_ucode.img,boot/i686/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/releng/syslinux/archiso_sys64.cfg b/releng/syslinux/archiso_sys64.cfg
@@ -1,9 +1,9 @@
 LABEL arch64
 TEXT HELP
-Boot the Arch Linux (x86_64) live medium.
-It allows you to install Arch Linux or perform system maintenance.
+Boot the Logos Linux (x86_64) live medium.
+It allows you to install Logos Linux or perform system maintenance.
 ENDTEXT
-MENU LABEL Boot Arch Linux (x86_64)
+MENU LABEL Boot Logos Linux (x86_64)
 LINUX boot/x86_64/vmlinuz
 INITRD boot/intel_ucode.img,boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/releng/syslinux/splash.png b/releng/syslinux/splash.png