[app-misc/calamares-sabayon-base-modules] simplify and unbreak

Sabayon · Sep 20, 2018 · 4e200fa · 4e200fa
1 parent 401587e
commit 4e200fa
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 1 deletion.
diff --git a/app-misc/calamares-sabayon-base-modules/calamares-sabayon-base-modules-1.14.ebuild b/app-misc/calamares-sabayon-base-modules/calamares-sabayon-base-modules-1.14.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/calamares-sabayon-${PV}"
 
 src_install() {
 	insinto "/etc/calamares/"
-	doins -r "${FILESDIR}/${PN}-conf-${PVR}/"*
+	doins -r "${FILESDIR}/modules-conf/"*
 	insinto "/usr/lib/calamares/modules/"
 	doins -r "${S}/"*
 	insinto "/etc/"

diff --git a/...ules-conf-1.12-r1/modules/bootloader.conf → ...iles/modules-conf/modules/bootloader.conf b/...ules-conf-1.12-r1/modules/bootloader.conf → ...iles/modules-conf/modules/bootloader.conf
diff --git a/...odules-conf-1.12-r1/modules/keyboard.conf → .../files/modules-conf/modules/keyboard.conf b/...odules-conf-1.12-r1/modules/keyboard.conf → .../files/modules-conf/modules/keyboard.conf
diff --git a/...odules-conf-1.12-r1/modules/packages.conf → .../files/modules-conf/modules/packages.conf b/...odules-conf-1.12-r1/modules/packages.conf → .../files/modules-conf/modules/packages.conf
diff --git a/...ules-conf-1.12-r1/modules/removeuser.conf → ...iles/modules-conf/modules/removeuser.conf b/...ules-conf-1.12-r1/modules/removeuser.conf → ...iles/modules-conf/modules/removeuser.conf
diff --git a/...odules-conf-1.12-r1/modules/services.conf → .../files/modules-conf/modules/services.conf b/...odules-conf-1.12-r1/modules/services.conf → .../files/modules-conf/modules/services.conf
diff --git a/...odules-conf-1.12-r1/modules/unpackfs.conf → .../files/modules-conf/modules/unpackfs.conf b/...odules-conf-1.12-r1/modules/unpackfs.conf → .../files/modules-conf/modules/unpackfs.conf
diff --git a/...e-modules-conf-1.12-r1/modules/users.conf → ...les/files/modules-conf/modules/users.conf b/...e-modules-conf-1.12-r1/modules/users.conf → ...les/files/modules-conf/modules/users.conf
diff --git a/...n-base-modules-conf-1.12-r1/settings.conf → ...-modules/files/modules-conf/settings.conf b/...n-base-modules-conf-1.12-r1/settings.conf → ...-modules/files/modules-conf/settings.conf