diff --git a/.drone.yml b/.drone.yml index 00c3c87..72122a5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,13 +6,15 @@ pipeline: build: image: registry.libreschool.org/libreschool-automation/libreschool-iso-builder:latest source_iso_url: http://repo.libreschool.org/nethserver/iso/nethserver-7.6.1810-x86_64.iso + output_iso: libreschool-7.6-x86_64.iso when: event: [ push, tag ] - gitea_release: +# THAT'S A BAD IDEA + gitea_release: group: deploy image: plugins/gitea-release - files: output.iso + files: libreschool-7.6-x86_64.iso checksum: - md5 - sha1 diff --git a/README.md b/README.md index 571726d..8b4882d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # libreschool-iso +[![Build Status](https://drone.libreschool.org/api/badges/paspo/libreschool-iso/status.svg)](https://drone.libreschool.org/paspo/libreschool-iso) + This tool automates the generation of LibreSchool iso \ No newline at end of file diff --git a/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-artwork.png b/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-artwork.png new file mode 100644 index 0000000..e68c1a5 Binary files /dev/null and b/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-artwork.png differ diff --git a/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-cloud.png b/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-cloud.png new file mode 100644 index 0000000..e68c1a5 Binary files /dev/null and b/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-cloud.png differ diff --git a/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-core.png b/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-core.png new file mode 100644 index 0000000..e68c1a5 Binary files /dev/null and b/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-core.png differ diff --git a/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-promotion.png b/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-promotion.png new file mode 100644 index 0000000..e68c1a5 Binary files /dev/null and b/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-promotion.png differ diff --git a/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-virtualization.png b/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-virtualization.png new file mode 100644 index 0000000..e68c1a5 Binary files /dev/null and b/anaconda/usr/share/anaconda/pixmaps/rnotes/en/centos-virtualization.png differ diff --git a/anaconda/usr/share/anaconda/pixmaps/sidebar-bg.png b/anaconda/usr/share/anaconda/pixmaps/sidebar-bg.png new file mode 100644 index 0000000..e03da22 Binary files /dev/null and b/anaconda/usr/share/anaconda/pixmaps/sidebar-bg.png differ diff --git a/anaconda/usr/share/anaconda/pixmaps/sidebar-logo.png b/anaconda/usr/share/anaconda/pixmaps/sidebar-logo.png new file mode 100644 index 0000000..f38a2c6 Binary files /dev/null and b/anaconda/usr/share/anaconda/pixmaps/sidebar-logo.png differ diff --git a/anaconda/usr/share/anaconda/pixmaps/topbar-bg.png b/anaconda/usr/share/anaconda/pixmaps/topbar-bg.png new file mode 100644 index 0000000..8d03c1f Binary files /dev/null and b/anaconda/usr/share/anaconda/pixmaps/topbar-bg.png differ diff --git a/root/EFI/BOOT/grub.cfg b/root/EFI/BOOT/grub.cfg new file mode 100644 index 0000000..75c9466 --- /dev/null +++ b/root/EFI/BOOT/grub.cfg @@ -0,0 +1,54 @@ +set default="0" + +function load_video { + insmod efi_gop + insmod efi_uga + insmod video_bochs + insmod video_cirrus + insmod all_video +} + +load_video +set gfxpayload=keep +insmod gzio +insmod part_gpt +insmod ext2 + +set timeout=60 +### END /etc/grub.d/00_header ### + +search --no-floppy --set=root -l 'nethserver' + +### BEGIN /etc/grub.d/10_linux ### +menuentry 'LibreSchool interactive installation' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=nethserver inst.ks=hd:LABEL=nethserver:/ks/interactive inst.nodmraid + initrdefi /images/pxeboot/initrd.img +} +submenu 'Other LibreSchool installation methods' { + menuentry 'Unattended installation - WARNING: existing disk data will be lost!' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=nethserver inst.ks=hd:LABEL=nethserver:/ks/unattended inst.nodmraid + initrdefi /images/pxeboot/initrd.img + } + menuentry 'Manual installation - WARNING: existing disk data will be lost!' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=nethserver inst.ks=hd:LABEL=nethserver:/ks/manual inst.nodmraid + initrdefi /images/pxeboot/initrd.img + } +} +menuentry 'Install CentOS 7' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=nethserver quiet + initrdefi /images/pxeboot/initrd.img +} +menuentry 'Test this media & install CentOS 7' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=nethserver rd.live.check quiet + initrdefi /images/pxeboot/initrd.img +} +submenu 'Troubleshooting -->' { + menuentry 'Install CentOS 7 in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=nethserver xdriver=vesa nomodeset quiet + initrdefi /images/pxeboot/initrd.img + } + menuentry 'Rescue a CentOS system' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /images/pxeboot/vmlinuz inst.stage2=hd:LABEL=nethserver rescue quiet + initrdefi /images/pxeboot/initrd.img + } +} diff --git a/root/isolinux/isolinux.cfg b/root/isolinux/isolinux.cfg new file mode 100644 index 0000000..96cc833 --- /dev/null +++ b/root/isolinux/isolinux.cfg @@ -0,0 +1,112 @@ +default vesamenu.c32 +#prompt 1 +#default interactive +timeout 600 + +display boot.msg + +menu background splash.jpg +menu title LibreSchool 7.6 +menu vshift 0 +menu rows 6 +menu helpmsgrow 12 +menu clear + +menu color border 0 #ffffffff #00000000 none +menu color sel 7 #ff1d247c #ffffffff none +menu color title 0 #ffffffff #00000000 none +menu color tabmsg 0 #ffffffff #00000000 none +menu color unsel 0 #ffffffff #00000000 none +menu color help 0 #ffffffff #00000000 none +menu color timeout 0 #ffffffff #00000000 none +menu color timeout_msg 0 #ffffffff #00000000 none +menu color hotsel 0 #ff000000 #ffffffff +menu color hotkey 7 #ffffffff #ff000000 +menu color scrollbar 0 #ffffffff #00000000 + +label interactive + menu label LibreSchool interactive installation + menu default + text help +WARNING! Existing disk data will be lost! + +Choose common installation options like keyboard, +time zone, RAID and network. + endtext + kernel vmlinuz + append initrd=initrd.img inst.stage2=hd:LABEL=nethserver inst.ks=hd:LABEL=nethserver:/ks/interactive inst.nodmraid + +menu begin + menu title Other LibreSchool installation methods + + label unattended + menu label Unattended installation + text help +WARNING! Existing disk data will be lost! + +Fully automated installation with default values: +* keyboard us +* timezone UTC +* root password LibreSchool,1234 +* DHCP network configuration + endtext + kernel vmlinuz + append initrd=initrd.img inst.stage2=hd:LABEL=nethserver quiet inst.ks=hd:LABEL=nethserver:/ks/unattended inst.nodmraid + + label manual + menu label Manual installation + text help +Customize storage and network parameters. + endtext + kernel vmlinuz + append initrd=initrd.img inst.stage2=hd:LABEL=nethserver quiet inst.ks=hd:LABEL=nethserver:/ks/manual inst.nodmraid + +menu end + +menu begin + menu title Standard CentOS installation + + label linux + menu label Install or upgrade an existing system + text help +Standard CentOS installation, fully customizable. + endtext + kernel vmlinuz + append initrd=initrd.img inst.stage2=hd:LABEL=nethserver quiet + + label vesa + menu label Install system with basic video driver + text help +Standard CentOS installation compatible with all graphic controllers. + endtext + kernel vmlinuz + append initrd=initrd.img inst.stage2=hd:LABEL=nethserver xdriver=vesa nomodeset quiet + +menu end + +menu begin Tools + menu title Tools + + label rescue + menu label Rescue installed system + kernel vmlinuz + append initrd=initrd.img inst.stage2=hd:LABEL=nethserver rescue quiet + + label memtest86 + menu label Memory test + kernel memtest + append - + + label hdt + menu label Hardware Detection Tool + text help +Check hardware with the Hardware Detection Tool + endtext + kernel hdt.c32 +menu end + +menu separtor + +label local + menu label Boot from local drive + localboot 0xffff diff --git a/root/ks/manual b/root/ks/manual index e97cb36..d6a77e3 100755 --- a/root/ks/manual +++ b/root/ks/manual @@ -10,6 +10,7 @@ %end repo --name=nethserver --baseurl=file:///run/install/repo/extras +repo --name=libreschool --baseurl=file:///run/install/repo/libreschool # Install OS instead of upgrade install diff --git a/root/ks/unattended b/root/ks/unattended index b43efce..08ee7d3 100755 --- a/root/ks/unattended +++ b/root/ks/unattended @@ -95,6 +95,7 @@ fi %end repo --name=nethserver --baseurl=file:///run/install/repo/extras +repo --name=libreschool --baseurl=file:///run/install/repo/libreschool # Install OS instead of upgrade install @@ -102,7 +103,7 @@ install %include /tmp/network-include firewall --disable # Root password -rootpw --plaintext Nethesis,1234 +rootpw --plaintext LibreSchool,1234 # System keyboard %include /tmp/keyboard-include # System language