From c351218662a9d45b49f88d00766d1e2721dfae62 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 23:55:03 +0100 Subject: [PATCH] update to 2.4 [release 2.4-1mamba;Thu Aug 26 2021] --- initscripts.spec | 144 ++++++++--------------------------------------- 1 file changed, 23 insertions(+), 121 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 186ec4c..01d83d2 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,8 +1,8 @@ %define utmp_groupid 17 Name: initscripts -Version: 2.3 -Release: 2mamba +Version: 2.4 +Release: 1mamba Summary: Common tools used by initscripts-sysv5 and systemd in sysv5 mode Group: System/Configuration Vendor: openmamba @@ -29,19 +29,11 @@ Requires: gzip Requires: findutils Requires: psmisc Provides: /etc/init.d -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Obsoletes: initscripts-sysv5 < 2.4 %description The initscripts package contains the basic system scripts used to boot your openmamba system, change runlevels, manage system services and network interfaces, and shut the system down cleanly. -%package sysv5 -Group: System/Configuration -Summary: The inittab file and the /etc/init.d scripts -Requires(post):%{name} = %{?epoch:%epoch:}%{version}-%{release} - -%description sysv5 -SysV5 init scripts. - %debug_package %prep @@ -55,19 +47,9 @@ SysV5 init scripts. [ "%{buildroot}" != / ] && rm -rf %{buildroot} %makeinstall -%find_lang %{name} - -# FIXME: bootsplash does not support utf-8 -#rm -f %{buildroot}%{_datadir}/locale/es/LC_MESSAGES/initscripts.mo -#rm -f %{buildroot}%{_datadir}/locale/fr/LC_MESSAGES/initscripts.mo -rm -f %{buildroot}/lib/modprobe.d/ipv6.conf - -rm -f %{buildroot}/sbin/fstab-decode -rm -f %{buildroot}%{_mandir}/man8/fstab-decode.* - %ifnarch %{ix86} x86_64 # don't blacklist framebuffer drivers for non x86 archs which don't have VESA/BIOS -rm -f %{buildroot}/lib/modprobe.d/blacklist-framebuffer.conf +rm -f %{buildroot}%{_prefix}/lib/modprobe.d/blacklist-framebuffer.conf # RTC clock is kept as localtime on PCs only due to windows #sed -i "s|UTC=0|UTC=1|" %{buildroot}%{_sysconfdir}/sysconfig/clock %endif @@ -151,134 +133,54 @@ _EOF fi : -%pre sysv5 -if [ $1 -ge 1 ]; then - [ -e /etc/rcsysinit.d -a ! -L /etc/rcsysinit.d ] && { - mv /etc/rcsysinit.d/* /etc/rc.d/rcsysinit.d/ - rmdir /etc/rcsysinit.d - ln -sf rc.d/rcsysinit.d /etc/rcsysinit.d - } -fi -: - -%post sysv5 -# new install or update -if [ $1 -ge 1 ]; then - /sbin/depinit - - # change vc/* into tty* devices - [ "`grep " vc/" /etc/inittab 2>/dev/null`" ] && { - sed -i "s| vc/| tty|" /etc/inittab - telinit q - } - - [ "`grep "1:2345:respawn" /etc/inittab 2>/dev/null`" ] && { - sed -i "s|^1:2345:respawn:/sbin/agetty|1:234:respawn:/sbin/agetty|" /etc/inittab - telinit q - } - - [ -e /etc/modules ] && mv /etc/modules /etc/modules-load.d/modules.conf - -fi -exit 0 - -%postun sysv5 -# update -if [ $1 -eq 1 ]; then - /sbin/depinit -fi -exit 0 - %files %defattr(-,root,root) %dir %{_initrddir} %{_sysconfdir}/init.d -%{_initrddir}/functions -%{_initrddir}/network-functions %attr(0755,root,root) %config(noreplace) %{_initrddir}/rc.local %dir %{_sysconfdir}/rc.d %{_sysconfdir}/rc?.d %dir %{_sysconfdir}/rc.d/rc?.d -#%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/modules -%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/sysconfig/rc -%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/sysconfig/network -%dir %{_sysconfdir}/sysconfig/network-scripts %dir %{_sysconfdir}/modules.d -/lib/modprobe.d/lp.conf -/lib/modprobe.d/rtl8192ce.conf +%{_sysconfdir}/sysconfig/functions +%{_sysconfdir}/sysconfig/rc +%{_bindir}/doexec +%{_bindir}/ipcalc +%{_bindir}/usleep +%{_sbindir}/console_init +%{_sbindir}/service +%{_sbindir}/consoletype +%{_sbindir}/genhostid +%{_sbindir}/getkey +%{_sbindir}/minilogd +%{_prefix}/lib/modprobe.d/lp.conf +%{_prefix}/lib/modprobe.d/rtl8192ce.conf %ifarch %{ix86} x86_64 -/lib/modprobe.d/blacklist-framebuffer.conf +%{_prefix}/lib/modprobe.d/blacklist-framebuffer.conf %endif -/lib/modprobe.d/blacklist-net.conf -/sbin/console_init -/sbin/service +%{_prefix}/lib/modprobe.d/blacklist-net.conf +%{_prefix}/lib/sysctl.d/40-openmamba.conf %ghost %attr(0600,root,utmp) %{_var}/log/btmp %ghost %attr(0664,root,utmp) %{_var}/log/lastlog %ghost %attr(0644,root,root) %{_var}/log/wtmp #%ghost %attr(0664,root,utmp) %{_var}/run/utmp -/bin/doexec -/bin/ipcalc -/bin/usleep -/sbin/consoletype -/sbin/genhostid -/sbin/getkey -/sbin/initlog -/sbin/minilogd -%{_prefix}/lib/sysctl.d/40-openmamba.conf #%dir %{_var}/run/netreport %dir %{_var}/spool/gdm %attr(4755,root,root) %{_sbindir}/usernetctl -%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/initlog.conf %{_mandir}/man1/consoletype.* %{_mandir}/man1/doexec.* %{_mandir}/man1/genhostid.* %{_mandir}/man1/getkey.* -%{_mandir}/man1/initlog.* %{_mandir}/man1/ipcalc.* %{_mandir}/man1/netreport.* %{_mandir}/man1/usleep.* %{_mandir}/man8/usernetctl.* %doc COPYING -%files sysv5 -f %{name}.lang -%defattr(-,root,root) -%verify(not md5 size mtime) %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/inittab -%{_sysconfdir}/rcsysinit.d -%{_sysconfdir}/rc.d/rcsysinit.d/ -%{_sysconfdir}/rc.d/rc?.d/K* -%{_sysconfdir}/rc.d/rc?.d/S* -%{_sysconfdir}/sysconfig/network-scripts/ifdown -%{_sysconfdir}/sysconfig/network-scripts/ifup -%{_sysconfdir}/sysconfig/network-scripts/ifup-routes -%{_sysconfdir}/sysconfig/network-scripts/ifup-wireless -%{_initrddir}/checkfs -%{_initrddir}/cleanfs -%{_initrddir}/console -%{_initrddir}/halt -%{_initrddir}/loadmodules -%{_initrddir}/localnet -%{_initrddir}/mountfs -%{_initrddir}/mountproc -%{_initrddir}/netfs -%{_initrddir}/network -%{_initrddir}/random -%{_initrddir}/rc -%{_initrddir}/rc.sysinit -%{_initrddir}/reboot -%{_initrddir}/sendsignals -%{_initrddir}/setclock -%{_initrddir}/swap -%{_initrddir}/sysctl -%{_initrddir}/sysinit -%{_initrddir}/template -/sbin/depinit -/sbin/ifdown -/sbin/ifrestart -/sbin/ifup -%attr(2755,root,root) /sbin/netreport -%{_var}/init/ - %changelog +* Thu Aug 26 2021 Silvan Calarco 2.4-1mamba +- update to 2.4 + * Sun Nov 29 2020 Silvan Calarco 2.3-2mamba - fix symlinks declared as dirs