diff --git a/t2linux-config/t2linux-config.spec b/t2linux-config/t2linux-config.spec index 280111b..2237133 100644 --- a/t2linux-config/t2linux-config.spec +++ b/t2linux-config/t2linux-config.spec @@ -1,5 +1,5 @@ Name: t2linux-config -Version: 14.0.0 +Version: 15.0.0 Release: 1%{?dist} Summary: System configuration for linux on t2 macs. License: MIT @@ -19,23 +19,31 @@ snd-seq EOF echo -e 'add_drivers+=" apple_bce snd_seq "' > t2linux-modules-install.conf -echo -e 'SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="ac:de:48:00:11:22", NAME="t2_ncm"' > 99-network-t2-ncm.rules -cat << EOF > 99-network-t2-ncm.conf +echo -e 'SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="ac:de:48:00:11:22", NAME="t2_ncm"' > 90-network-t2-ncm.rules +cat << EOF > 90-network-t2-ncm.conf [main] no-auto-default=t2_ncm EOF +cat << EOF > 91-t2linux.preset +enable get-apple-firmware.service +enable t2fanrd.service +EOF + %install install -D -m 644 t2linux-modules-install.conf %{buildroot}/usr/lib/dracut/dracut.conf.d/t2linux-modules-install.conf install -D -m 644 t2linux-modules.conf %{buildroot}/usr/lib/modules-load.d/t2linux-modules.conf -install -D -m 644 99-network-t2-ncm.rules %{buildroot}%{_udevrulesdir}/99-network-t2-ncm.rules -install -D -m 644 99-network-t2-ncm.conf %{buildroot}/usr/lib/NetworkManager/conf.d/99-network-t2-ncm.conf +install -D -m 644 90-network-t2-ncm.rules %{buildroot}%{_udevrulesdir}/90-network-t2-ncm.rules +install -D -m 644 90-network-t2-ncm.conf %{buildroot}/usr/lib/NetworkManager/conf.d/90-network-t2-ncm.conf + +install -D -m 644 91-t2linux.preset %{buildroot}/usr/lib/systemd/system-preset/91-t2linux.preset %files /usr/lib/modules-load.d/t2linux-modules.conf /usr/lib/dracut/dracut.conf.d/t2linux-modules-install.conf -%{_udevrulesdir}/99-network-t2-ncm.rules -/usr/lib/NetworkManager/conf.d/99-network-t2-ncm.conf +%{_udevrulesdir}/90-network-t2-ncm.rules +/usr/lib/NetworkManager/conf.d/90-network-t2-ncm.conf +/usr/lib/systemd/system-preset/91-t2linux.preset diff --git a/t2linux-scripts/t2linux-scripts.spec b/t2linux-scripts/t2linux-scripts.spec index 0c1261c..8562534 100644 --- a/t2linux-scripts/t2linux-scripts.spec +++ b/t2linux-scripts/t2linux-scripts.spec @@ -1,7 +1,7 @@ %global wiki_commit f71483df460fb97d5c39edf3af03dfc5f6be9a7c Name: t2linux-scripts -Version: 2.1.0 +Version: 2.2.0 Release: 1%{?dist} Summary: t2linux support scripts License: MIT @@ -20,15 +20,10 @@ t2linux first boot and support scripts %build -cat << EOF > 55-get-apple-firmware.preset -enable get-apple-firmware.service -EOF - %install install -D -m 755 %{SOURCE0} %{buildroot}/%{_libexecdir}/get-apple-firmware install -D -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/get-apple-firmware.service -install -D -m 644 55-get-apple-firmware.preset %{buildroot}/usr/lib/systemd/system-preset/55-get-apple-firmware.preset %post @@ -46,4 +41,3 @@ install -D -m 644 55-get-apple-firmware.preset %{buildroot}/usr/lib/systemd/syst %files %{_libexecdir}/get-apple-firmware %{_unitdir}/get-apple-firmware.service -/usr/lib/systemd/system-preset/55-get-apple-firmware.preset