diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/dracut/10video/load-video.sh b/profiles/templates/3.3/2_ac_install_merge/sys-kernel/dracut/10video/load-video.sh old mode 100644 new mode 100755 index 1ec4ae853..7a1850514 --- a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/dracut/10video/load-video.sh +++ b/profiles/templates/3.3/2_ac_install_merge/sys-kernel/dracut/10video/load-video.sh @@ -1,4 +1,3 @@ -# Calculate chmod=0755 load_videodrv() { info "Loading frame buffer video driver" @@ -7,6 +6,7 @@ load_videodrv() { -name "nouveau.ko*" -o \ -name "uvesafb.ko*" -o \ -name "i915.ko*" -o \ + -name "amdgpu.ko*" -o \ -name "radeon.ko*" | grep -c "") # load specified videodrv @@ -18,6 +18,9 @@ load_videodrv() { radeon) modules_list="radeon" ;; + amdgpu) + modules_list="amdgpu" + ;; none) return 0; ;; diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh b/profiles/templates/3.3/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh index 703c9bca3..a11a8ff76 100644 --- a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh +++ b/profiles/templates/3.3/2_ac_install_merge/sys-kernel/dracut/10video/module-setup.sh @@ -16,7 +16,7 @@ depends() { } installkernel() { - instmods radeon uvesafb nouveau i915 + instmods radeon uvesafb nouveau i915 amdgpu } install() { @@ -31,7 +31,7 @@ install() { inst_hook pre-trigger 01 "$moddir/load-video.sh" inst_hook cmdline 50 "$moddir/parse-cmdline.sh" mkdir -p ${initdir}/etc/modprobe.d - for videomodule in fglrx nvidia radeon nouveau i915 uvesafb + for videomodule in fglrx nvidia radeon nouveau i915 uvesafb amdgpu do echo "blacklist ${videomodule}" >>${initdir}/etc/modprobe.d/video-blacklist.conf done diff --git a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh b/profiles/templates/3.3/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh old mode 100644 new mode 100755 index c2178ca9d..0a8953917 --- a/profiles/templates/3.3/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh +++ b/profiles/templates/3.3/2_ac_install_merge/sys-kernel/dracut/10video/parse-cmdline.sh @@ -1,4 +1,3 @@ -# Calculate chmod=0755 #!/bin/sh # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini index c4642effa..d3774d3ff 100644 --- a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/00-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 = 93 +remerge = 94 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/94 b/profiles/templates/3.3/6_ac_update_sync/remerge/94 new file mode 100644 index 000000000..a146c2269 --- /dev/null +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/94 @@ -0,0 +1,4 @@ +# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-kernel/dracut ini(overlay-calculate.remerge)<94 + +[overlay-calculate] +remerge = 94