upgrade to nethserver 7.7
This commit is contained in:
parent
2c3e2178b0
commit
1fc5804085
@ -5,8 +5,8 @@ steps:
|
|||||||
- name: build
|
- name: build
|
||||||
image: registry.libreschool.org/libreschool-automation/libreschool-iso-builder:latest
|
image: registry.libreschool.org/libreschool-automation/libreschool-iso-builder:latest
|
||||||
settings:
|
settings:
|
||||||
source_iso_url: http://repo.libreschool.org/nethserver/iso/nethserver-7.6.1810-x86_64.iso
|
source_iso_url: http://repo.libreschool.org/nethserver/iso/nethserver-7.7.1908-x86_64.iso
|
||||||
output_iso: libreschool-7.6-x86_64.iso
|
output_iso: libreschool-7.7-x86_64.iso
|
||||||
when:
|
when:
|
||||||
event: [ push, tag ]
|
event: [ push, tag ]
|
||||||
|
|
||||||
@ -31,7 +31,7 @@ steps:
|
|||||||
- name: repo_upload
|
- name: repo_upload
|
||||||
image: appleboy/drone-scp
|
image: appleboy/drone-scp
|
||||||
settings:
|
settings:
|
||||||
source: libreschool-7.6-x86_64.iso
|
source: libreschool-7.7-x86_64.iso
|
||||||
target: /vhosts/repo.libreschool.org/https/iso
|
target: /vhosts/repo.libreschool.org/https/iso
|
||||||
host: repo.libreschool.org
|
host: repo.libreschool.org
|
||||||
username:
|
username:
|
||||||
|
@ -13,6 +13,7 @@ krb5-libs
|
|||||||
krb5-workstation
|
krb5-workstation
|
||||||
libcom_err
|
libcom_err
|
||||||
libreschool-client-manager
|
libreschool-client-manager
|
||||||
|
libreschool-nfs
|
||||||
libreschool-release
|
libreschool-release
|
||||||
libss
|
libss
|
||||||
nethserver-antivirus
|
nethserver-antivirus
|
||||||
|
@ -6,7 +6,7 @@ timeout 600
|
|||||||
display boot.msg
|
display boot.msg
|
||||||
|
|
||||||
menu background splash.jpg
|
menu background splash.jpg
|
||||||
menu title LibreSchool 7.6
|
menu title LibreSchool 7
|
||||||
menu vshift 0
|
menu vshift 0
|
||||||
menu rows 6
|
menu rows 6
|
||||||
menu helpmsgrow 12
|
menu helpmsgrow 12
|
||||||
@ -34,7 +34,7 @@ Choose common installation options like keyboard,
|
|||||||
time zone, RAID and network.
|
time zone, RAID and network.
|
||||||
endtext
|
endtext
|
||||||
kernel vmlinuz
|
kernel vmlinuz
|
||||||
append initrd=initrd.img inst.stage2=hd:LABEL=nethserver inst.ks=hd:LABEL=nethserver:/ks/interactive inst.nodmraid
|
append initrd=initrd.img inst.stage2=hd:LABEL=nethserver inst.ks=hd:LABEL=nethserver:/ks/interactive inst.nodmraid net.ifnames=0 biosdevname=0
|
||||||
|
|
||||||
menu begin
|
menu begin
|
||||||
menu title Other LibreSchool installation methods
|
menu title Other LibreSchool installation methods
|
||||||
@ -51,7 +51,7 @@ Fully automated installation with default values:
|
|||||||
* DHCP network configuration
|
* DHCP network configuration
|
||||||
endtext
|
endtext
|
||||||
kernel vmlinuz
|
kernel vmlinuz
|
||||||
append initrd=initrd.img inst.stage2=hd:LABEL=nethserver quiet inst.ks=hd:LABEL=nethserver:/ks/unattended inst.nodmraid
|
append initrd=initrd.img inst.stage2=hd:LABEL=nethserver quiet inst.ks=hd:LABEL=nethserver:/ks/unattended inst.nodmraid net.ifnames=0 biosdevname=0
|
||||||
|
|
||||||
label unattended-it
|
label unattended-it
|
||||||
menu label Unattended installation (Italian)
|
menu label Unattended installation (Italian)
|
||||||
@ -65,7 +65,7 @@ Fully automated installation with default values:
|
|||||||
* DHCP network configuration
|
* DHCP network configuration
|
||||||
endtext
|
endtext
|
||||||
kernel vmlinuz
|
kernel vmlinuz
|
||||||
append initrd=initrd.img inst.stage2=hd:LABEL=nethserver quiet inst.ks=hd:LABEL=nethserver:/ks/unattended-it inst.nodmraid
|
append initrd=initrd.img inst.stage2=hd:LABEL=nethserver quiet inst.ks=hd:LABEL=nethserver:/ks/unattended-it inst.nodmraid net.ifnames=0 biosdevname=0
|
||||||
|
|
||||||
label manual
|
label manual
|
||||||
menu label Manual installation
|
menu label Manual installation
|
||||||
@ -73,7 +73,7 @@ Fully automated installation with default values:
|
|||||||
Customize storage and network parameters.
|
Customize storage and network parameters.
|
||||||
endtext
|
endtext
|
||||||
kernel vmlinuz
|
kernel vmlinuz
|
||||||
append initrd=initrd.img inst.stage2=hd:LABEL=nethserver quiet inst.ks=hd:LABEL=nethserver:/ks/manual inst.nodmraid
|
append initrd=initrd.img inst.stage2=hd:LABEL=nethserver quiet inst.ks=hd:LABEL=nethserver:/ks/manual inst.nodmraid net.ifnames=0 biosdevname=0
|
||||||
|
|
||||||
menu end
|
menu end
|
||||||
|
|
||||||
@ -119,7 +119,7 @@ Check hardware with the Hardware Detection Tool
|
|||||||
kernel hdt.c32
|
kernel hdt.c32
|
||||||
menu end
|
menu end
|
||||||
|
|
||||||
menu separtor
|
menu separator
|
||||||
|
|
||||||
label local
|
label local
|
||||||
menu label Boot from local drive
|
menu label Boot from local drive
|
||||||
|
@ -60,7 +60,7 @@ fi
|
|||||||
|
|
||||||
# enable dhcp on all network interfaces
|
# enable dhcp on all network interfaces
|
||||||
for net in `find /sys/class/net/ -mindepth 1 ! -name lo | cut -d '/' -f5`; do
|
for net in `find /sys/class/net/ -mindepth 1 ! -name lo | cut -d '/' -f5`; do
|
||||||
echo "network --activate --onboot=yes --bootproto=dhcp --device=$net" --nameserver=8.8.8.8 >>/tmp/network-include
|
echo "network --activate --onboot=yes --bootproto=dhcp --device=$net" >>/tmp/network-include
|
||||||
done
|
done
|
||||||
echo "network --nameserver=8.8.8.8 --hostname=pdc.libre.school" >> /tmp/network-include
|
echo "network --nameserver=8.8.8.8 --hostname=pdc.libre.school" >> /tmp/network-include
|
||||||
|
|
||||||
@ -81,6 +81,7 @@ fi
|
|||||||
@nethserver-iso
|
@nethserver-iso
|
||||||
@core
|
@core
|
||||||
@libreschool-iso
|
@libreschool-iso
|
||||||
|
-biosdevname
|
||||||
%end
|
%end
|
||||||
|
|
||||||
repo --name=nethserver --baseurl=file:///run/install/repo/extras
|
repo --name=nethserver --baseurl=file:///run/install/repo/extras
|
||||||
@ -142,29 +143,8 @@ if [ -f /etc/nethserver-release ]; then
|
|||||||
echo -e 'Kernel \\r on an \\m\n' >> /etc/issue
|
echo -e 'Kernel \\r on an \\m\n' >> /etc/issue
|
||||||
echo 'Access the web interface at the following URLs:' >> /etc/issue
|
echo 'Access the web interface at the following URLs:' >> /etc/issue
|
||||||
ip -o -4 addr | tr -s ' /' $'\t' | cut -f 4 | grep -vF 127.0.0.1 | xargs -I IP -- echo https://IP:980 >> /etc/issue
|
ip -o -4 addr | tr -s ' /' $'\t' | cut -f 4 | grep -vF 127.0.0.1 | xargs -I IP -- echo https://IP:980 >> /etc/issue
|
||||||
|
ip -o -4 addr | tr -s ' /' $'\t' | cut -f 4 | grep -vF 127.0.0.1 | xargs -I IP -- echo https://IP:9090 >> /etc/issue
|
||||||
echo >> /etc/issue
|
echo >> /etc/issue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Renaming network interfaces"
|
|
||||||
TMPFILE=/tmp/9C358C31-BC02-4B63-BAAB-4D82DA0E297C
|
|
||||||
OUTFILE=/etc/udev/rules.d/70-persistent-net.rules
|
|
||||||
ip link show | grep 'link/ether' | sed 's/.*ether\ \([0-9a-fA-F:]*\)\ brd.*/\1/' > $TMPFILE
|
|
||||||
LINES=$(wc -l $TMPFILE)
|
|
||||||
# TODO: should be at least 2 lines
|
|
||||||
N=0
|
|
||||||
while read MAC ; do
|
|
||||||
if (( N > 1 )) ; then
|
|
||||||
NUM=$(( N-1 ))
|
|
||||||
echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"${MAC}\", NAME=\"lan${NUM}\"" >> $OUTFILE
|
|
||||||
fi
|
|
||||||
if (( N == 1 )) ; then
|
|
||||||
echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"${MAC}\", NAME=\"wan0\"" >> $OUTFILE
|
|
||||||
fi
|
|
||||||
if (( N == 0 )) ; then
|
|
||||||
echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"${MAC}\", NAME=\"lan0\"" >> $OUTFILE
|
|
||||||
fi
|
|
||||||
N=$(( N + 1 ))
|
|
||||||
done < $TMPFILE
|
|
||||||
rm $TMPFILE
|
|
||||||
|
|
||||||
%end
|
%end
|
||||||
|
@ -1,7 +1,13 @@
|
|||||||
#platform=x86, AMD64, or Intel EM64T
|
#platform=x86, AMD64, or Intel EM64T
|
||||||
#version=RHEL7
|
#version=RHEL7
|
||||||
|
%pre
|
||||||
|
|
||||||
|
# enable dhcp on all network interfaces
|
||||||
|
for net in `find /sys/class/net/ -mindepth 1 ! -name lo | cut -d '/' -f5`; do
|
||||||
|
echo "network --activate --onboot=yes --bootproto=dhcp --device=$net" >>/tmp/network-include
|
||||||
|
done
|
||||||
echo "network --nameserver=8.8.8.8 --hostname=pdc.libre.school" >> /tmp/network-include
|
echo "network --nameserver=8.8.8.8 --hostname=pdc.libre.school" >> /tmp/network-include
|
||||||
|
|
||||||
#
|
#
|
||||||
# Selected packages
|
# Selected packages
|
||||||
#
|
#
|
||||||
@ -9,6 +15,7 @@ echo "network --nameserver=8.8.8.8 --hostname=pdc.libre.school" >> /tmp/network-
|
|||||||
@nethserver-iso
|
@nethserver-iso
|
||||||
@core
|
@core
|
||||||
@libreschool-iso
|
@libreschool-iso
|
||||||
|
-biosdevname
|
||||||
%end
|
%end
|
||||||
|
|
||||||
repo --name=nethserver --baseurl=file:///run/install/repo/extras
|
repo --name=nethserver --baseurl=file:///run/install/repo/extras
|
||||||
@ -52,29 +59,8 @@ if [ -f /etc/nethserver-release ]; then
|
|||||||
echo -e 'Kernel \\r on an \\m\n' >> /etc/issue
|
echo -e 'Kernel \\r on an \\m\n' >> /etc/issue
|
||||||
echo 'Access the web interface at the following URLs:' >> /etc/issue
|
echo 'Access the web interface at the following URLs:' >> /etc/issue
|
||||||
ip -o -4 addr | tr -s ' /' $'\t' | cut -f 4 | grep -vF 127.0.0.1 | xargs -I IP -- echo https://IP:980 >> /etc/issue
|
ip -o -4 addr | tr -s ' /' $'\t' | cut -f 4 | grep -vF 127.0.0.1 | xargs -I IP -- echo https://IP:980 >> /etc/issue
|
||||||
|
ip -o -4 addr | tr -s ' /' $'\t' | cut -f 4 | grep -vF 127.0.0.1 | xargs -I IP -- echo https://IP:9090 >> /etc/issue
|
||||||
echo >> /etc/issue
|
echo >> /etc/issue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Renaming network interfaces"
|
|
||||||
TMPFILE=/tmp/9C358C31-BC02-4B63-BAAB-4D82DA0E297C
|
|
||||||
OUTFILE=/etc/udev/rules.d/70-persistent-net.rules
|
|
||||||
ip link show | grep 'link/ether' | sed 's/.*ether\ \([0-9a-fA-F:]*\)\ brd.*/\1/' > $TMPFILE
|
|
||||||
LINES=$(wc -l $TMPFILE)
|
|
||||||
# TODO: should be at least 2 lines
|
|
||||||
N=0
|
|
||||||
while read MAC ; do
|
|
||||||
if (( N > 1 )) ; then
|
|
||||||
NUM=$(( N-1 ))
|
|
||||||
echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"${MAC}\", NAME=\"lan${NUM}\"" >> $OUTFILE
|
|
||||||
fi
|
|
||||||
if (( N == 1 )) ; then
|
|
||||||
echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"${MAC}\", NAME=\"wan0\"" >> $OUTFILE
|
|
||||||
fi
|
|
||||||
if (( N == 0 )) ; then
|
|
||||||
echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"${MAC}\", NAME=\"lan0\"" >> $OUTFILE
|
|
||||||
fi
|
|
||||||
N=$(( N + 1 ))
|
|
||||||
done < $TMPFILE
|
|
||||||
rm $TMPFILE
|
|
||||||
|
|
||||||
%end
|
%end
|
||||||
|
@ -93,6 +93,7 @@ fi
|
|||||||
@nethserver-iso
|
@nethserver-iso
|
||||||
@core
|
@core
|
||||||
@libreschool-iso
|
@libreschool-iso
|
||||||
|
-biosdevname
|
||||||
%end
|
%end
|
||||||
|
|
||||||
repo --name=nethserver --baseurl=file:///run/install/repo/extras
|
repo --name=nethserver --baseurl=file:///run/install/repo/extras
|
||||||
@ -157,29 +158,8 @@ if [ -f /etc/nethserver-release ]; then
|
|||||||
echo -e 'Kernel \\r on an \\m\n' >> /etc/issue
|
echo -e 'Kernel \\r on an \\m\n' >> /etc/issue
|
||||||
echo 'Access the web interface at the following URLs:' >> /etc/issue
|
echo 'Access the web interface at the following URLs:' >> /etc/issue
|
||||||
ip -o -4 addr | tr -s ' /' $'\t' | cut -f 4 | grep -vF 127.0.0.1 | xargs -I IP -- echo https://IP:980 >> /etc/issue
|
ip -o -4 addr | tr -s ' /' $'\t' | cut -f 4 | grep -vF 127.0.0.1 | xargs -I IP -- echo https://IP:980 >> /etc/issue
|
||||||
|
ip -o -4 addr | tr -s ' /' $'\t' | cut -f 4 | grep -vF 127.0.0.1 | xargs -I IP -- echo https://IP:9090 >> /etc/issue
|
||||||
echo >> /etc/issue
|
echo >> /etc/issue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Renaming network interfaces"
|
|
||||||
TMPFILE=/tmp/9C358C31-BC02-4B63-BAAB-4D82DA0E297C
|
|
||||||
OUTFILE=/etc/udev/rules.d/70-persistent-net.rules
|
|
||||||
ip link show | grep 'link/ether' | sed 's/.*ether\ \([0-9a-fA-F:]*\)\ brd.*/\1/' > $TMPFILE
|
|
||||||
LINES=$(wc -l $TMPFILE)
|
|
||||||
# TODO: should be at least 2 lines
|
|
||||||
N=0
|
|
||||||
while read MAC ; do
|
|
||||||
if (( N > 1 )) ; then
|
|
||||||
NUM=$(( N-1 ))
|
|
||||||
echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"${MAC}\", NAME=\"lan${NUM}\"" >> $OUTFILE
|
|
||||||
fi
|
|
||||||
if (( N == 1 )) ; then
|
|
||||||
echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"${MAC}\", NAME=\"wan0\"" >> $OUTFILE
|
|
||||||
fi
|
|
||||||
if (( N == 0 )) ; then
|
|
||||||
echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"${MAC}\", NAME=\"lan0\"" >> $OUTFILE
|
|
||||||
fi
|
|
||||||
N=$(( N + 1 ))
|
|
||||||
done < $TMPFILE
|
|
||||||
rm $TMPFILE
|
|
||||||
|
|
||||||
%end
|
%end
|
||||||
|
@ -94,6 +94,7 @@ fi
|
|||||||
@core
|
@core
|
||||||
@libreschool-iso
|
@libreschool-iso
|
||||||
nethserver-lang-it
|
nethserver-lang-it
|
||||||
|
-biosdevname
|
||||||
%end
|
%end
|
||||||
|
|
||||||
repo --name=nethserver --baseurl=file:///run/install/repo/extras
|
repo --name=nethserver --baseurl=file:///run/install/repo/extras
|
||||||
@ -109,7 +110,7 @@ rootpw --plaintext LibreSchool,1234
|
|||||||
# System keyboard
|
# System keyboard
|
||||||
%include /tmp/keyboard-include
|
%include /tmp/keyboard-include
|
||||||
# System language
|
# System language
|
||||||
lang en_US
|
lang it_IT
|
||||||
# SELinux configuration
|
# SELinux configuration
|
||||||
selinux --permissive
|
selinux --permissive
|
||||||
# Do not configure the X Window System
|
# Do not configure the X Window System
|
||||||
@ -158,29 +159,8 @@ if [ -f /etc/nethserver-release ]; then
|
|||||||
echo -e 'Kernel \\r on an \\m\n' >> /etc/issue
|
echo -e 'Kernel \\r on an \\m\n' >> /etc/issue
|
||||||
echo 'Access the web interface at the following URLs:' >> /etc/issue
|
echo 'Access the web interface at the following URLs:' >> /etc/issue
|
||||||
ip -o -4 addr | tr -s ' /' $'\t' | cut -f 4 | grep -vF 127.0.0.1 | xargs -I IP -- echo https://IP:980 >> /etc/issue
|
ip -o -4 addr | tr -s ' /' $'\t' | cut -f 4 | grep -vF 127.0.0.1 | xargs -I IP -- echo https://IP:980 >> /etc/issue
|
||||||
|
ip -o -4 addr | tr -s ' /' $'\t' | cut -f 4 | grep -vF 127.0.0.1 | xargs -I IP -- echo https://IP:9090 >> /etc/issue
|
||||||
echo >> /etc/issue
|
echo >> /etc/issue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Renaming network interfaces"
|
|
||||||
TMPFILE=/tmp/9C358C31-BC02-4B63-BAAB-4D82DA0E297C
|
|
||||||
OUTFILE=/etc/udev/rules.d/70-persistent-net.rules
|
|
||||||
ip link show | grep 'link/ether' | sed 's/.*ether\ \([0-9a-fA-F:]*\)\ brd.*/\1/' > $TMPFILE
|
|
||||||
LINES=$(wc -l $TMPFILE)
|
|
||||||
# TODO: should be at least 2 lines
|
|
||||||
N=0
|
|
||||||
while read MAC ; do
|
|
||||||
if (( N > 1 )) ; then
|
|
||||||
NUM=$(( N-1 ))
|
|
||||||
echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"${MAC}\", NAME=\"lan${NUM}\"" >> $OUTFILE
|
|
||||||
fi
|
|
||||||
if (( N == 1 )) ; then
|
|
||||||
echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"${MAC}\", NAME=\"wan0\"" >> $OUTFILE
|
|
||||||
fi
|
|
||||||
if (( N == 0 )) ; then
|
|
||||||
echo "SUBSYSTEM==\"net\", ACTION==\"add\", DRIVERS==\"?*\", ATTR{address}==\"${MAC}\", NAME=\"lan0\"" >> $OUTFILE
|
|
||||||
fi
|
|
||||||
N=$(( N + 1 ))
|
|
||||||
done < $TMPFILE
|
|
||||||
rm $TMPFILE
|
|
||||||
|
|
||||||
%end
|
%end
|
@ -24,6 +24,7 @@
|
|||||||
<packagereq type='mandatory'>nethserver-squidguard</packagereq>
|
<packagereq type='mandatory'>nethserver-squidguard</packagereq>
|
||||||
<packagereq type='mandatory'>libreschool-release</packagereq>
|
<packagereq type='mandatory'>libreschool-release</packagereq>
|
||||||
<packagereq type='mandatory'>libreschool-client-manager</packagereq>
|
<packagereq type='mandatory'>libreschool-client-manager</packagereq>
|
||||||
|
<packagereq type='mandatory'>libreschool-nfs</packagereq>
|
||||||
<packagereq type='mandatory'>nethserver-usercsvimport</packagereq>
|
<packagereq type='mandatory'>nethserver-usercsvimport</packagereq>
|
||||||
</packagelist>
|
</packagelist>
|
||||||
</group>
|
</group>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user