diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/udev b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/udev new file mode 100644 index 000000000..2913fcb28 --- /dev/null +++ b/profiles/templates/3.6/2_ac_install_merge/sys-fs/eudev/udev @@ -0,0 +1,15 @@ +# Calculate format=patch path=/etc/init.d ini(container.type)==desktop +# make sure /dev is a mounted devtmpfs + if ! mountinfo -q -f devtmpfs /dev; then + eerror "Udev requires /dev to be a mounted devtmpfs." + eerror "Please reconfigure your system." + return 1 + fi + +# make sure /dev is a mounted devtmpfs + #if ! mountinfo -q -f devtmpfs /dev; then + # eerror "Udev requires /dev to be a mounted devtmpfs." + # eerror "Please reconfigure your system." + # return 1 + #fi + diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh index 96724c65b..736e975c2 100755 --- a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh +++ b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/80calculate/module-setup.sh @@ -12,7 +12,7 @@ depends() { #?pkg(sys-kernel/dracut)<049# [[ $hostonly ]] || echo rootfs-block dmsquash-live #!pkg# - [[ $hostonly ]] || echo rootfs-block dmsquash-live network-legacy + [[ $hostonly ]] || echo rootfs-block dmsquash-live network-legacy network #pkg# return 0 } diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini index ee80d893b..495bccae5 100644 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 20201230.1 +remerge = 20210209 diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/.calculate_directory b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/.calculate_directory new file mode 100644 index 000000000..502c8f9ce --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip ini(overlay-calculate.remerge)<20220101 diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210209 b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210209 new file mode 100644 index 000000000..097a123a3 --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210209 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-kernel/dracut + +[overlay-calculate] +remerge = #-cl_pass_file-#