sys-apps/baselayout : revision bump

8 files changed, 261 insertions, 7 deletions

diff --git a/metadata/md5-cache/sys-apps/baselayout-2.7-r10 b/metadata/md5-cache/sys-apps/baselayout-2.7-r11
index 23248768..57df1eb0 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.7-r10
+++ b/metadata/md5-cache/sys-apps/baselayout-2.7-r11
@@ -1,11 +1,14 @@
 DEFINED_PHASES=install postinst preinst prepare setup
+DEPEND=acct-group/smbshare
 DESCRIPTION=Filesystem baselayout and init scripts
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=multilib versionator prefix
 IUSE=build kernel_FreeBSD kernel_linux +split-usr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
+RDEPEND=acct-group/smbshare
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.7.tar.bz2
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4b66d835ec72e021e359bb81eacfe988	prefix	d04f14b297013ad1410550c0757f14f8	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=d5d99f6ef4295e38e1e22aa96a19e4fd
+_md5_=fd4928162a2de5e9a84fdaf6b5d57840
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index a0c5bdfc..09f382e3 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -37,7 +37,7 @@ net-libs/webkit-gtk 2.30.3-r100: Open source web browser engine
 net-print/cnijfilter 4.10-r2: Canon InkJet Printer Driver for Linux (Pixus/Pixma-Series)
 net-wireless/broadcom-sta 6.30.223.271-r2: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
 net-wireless/rtl8821cu 5.8.1: Realtek RTL8821CU USB Wi-Fi adapter driver for Linux
-sys-apps/baselayout 2.7-r10: Filesystem baselayout and init scripts
+sys-apps/baselayout 2.7-r11: Filesystem baselayout and init scripts
 sys-apps/firetools 0.9.46: Graphical user interface of app-emulation/firejail
 sys-apps/lsb-release 1.4-r11: LSB version query program
 sys-apps/openrc 0.42.1-r7: OpenRC manages the services, startup and shutdown of a host
diff --git a/sys-apps/baselayout/baselayout-2.7-r10.ebuild b/sys-apps/baselayout/baselayout-2.7-r11.ebuild
index 16850ca1..1f771647 100644
--- a/sys-apps/baselayout/baselayout-2.7-r10.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7-r11.ebuild
@@ -19,6 +19,9 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="build kernel_FreeBSD kernel_linux +split-usr"
 
+DEPEND="acct-group/smbshare"
+RDEPEND="${DEPEND}"
+
 pkg_setup() {
 	multilib_layout
 }
@@ -234,6 +237,38 @@ src_install() {
 	dodir /usr/lib
 	mv "${ED}"/etc/os-release "${ED}"/usr/lib || die
 	dosym ../usr/lib/os-release /etc/os-release
+
+	############### Redcore Linux ###############
+	#
+	# issue.logo
+	rm "${ED}"/etc/issue.logo
+	#
+	# NetworkManager
+	dodir /etc/NetworkManager
+	insinto /etc/NetworkManager
+	newins "${FILESDIR}"/nmcfg NetworkManager.conf
+	#
+	# dracut
+	dodir /etc/dracut.conf.d
+	insinto /etc/dracut.conf.d
+	newins "${FILESDIR}"/dracutcfg dracut-redcore.conf
+	#
+	# grub
+	dodir /etc/default
+	insinto /etc/default
+	newins "${FILESDIR}"/grubcfg grub
+	#
+	# samba
+	dodir /etc/samba
+	insinto /etc/samba
+	newins "${FILESDIR}"/smbcfg smb.conf
+	keepdir var/lib/samba/usershare
+	# cryptsetup
+	dodir /etc/conf.d
+	insinto /etc/conf.d
+	newins ${FILESDIR}/dmcryptcfg dmcrypt
+	#
+	##############################################
 }
 
 pkg_postinst() {
@@ -257,11 +292,6 @@ pkg_postinst() {
 		fi
 	done
 
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"etc/._cfg0000_redcore-release ] ; then
-		mv "${EROOT}"etc/._cfg0000_redcore-release "${EROOT}"etc/redcore-release || die
-	fi
-
 	# whine about users that lack passwords #193541
 	if [[ -e "${EROOT}"etc/shadow ]] ; then
 		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
@@ -315,4 +345,14 @@ pkg_postinst() {
 		ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
 		ewarn "Please migrate your changes."
 	fi
+
+	############### Redcore Linux ###############
+	mv "${EROOT}"etc/._cfg????_redcore-release "${EROOT}"etc/redcore-release || die
+	rm -rf "${EROOT}"etc/dracut.conf.d/._cfg????_dracut-redcore.conf
+	rm -rf "${EROOT}"etc/default/._cfg????_grub
+	rm -rf "${EROOT}"etc/samba/._cfg????_smb.conf
+	rm -rf "${EROOT}"etc/conf.d/._cfg???_dmcrypt
+	chown root:smbshare /var/lib/samba/usershare
+	chmod 1770 /var/lib/samba/usershare
+	############################################
 }
diff --git a/sys-apps/baselayout/files/dmcryptcfg b/sys-apps/baselayout/files/dmcryptcfg
new file mode 100644
index 00000000..642ff087
--- /dev/null
+++ b/sys-apps/baselayout/files/dmcryptcfg
@@ -0,0 +1,111 @@
+# /etc/conf.d/dmcrypt
+
+# For people who run dmcrypt on top of some other layer (like raid),
+# use rc_need to specify that requirement.  See the runscript(8) man
+# page for more information.
+
+#--------------------
+# Instructions
+#--------------------
+
+# Note regarding the syntax of this file.  This file is *almost* bash,
+# but each line is evaluated separately.  Separate swaps/targets can be
+# specified.  The init-script which reads this file assumes that a
+# swap= or target= line starts a new section, similar to lilo or grub
+# configuration.
+
+# Note when using gpg keys and /usr on a separate partition, you will
+# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly
+# and ensure that gpg has been compiled statically.
+# See http://bugs.gentoo.org/90482 for more information.
+
+# Note that the init-script which reads this file detects whether your
+# partition is LUKS or not. No mkfs is run unless you specify a makefs
+# option.
+
+# Global options:
+#----------------
+
+# How long to wait for each timeout (in seconds).
+dmcrypt_key_timeout=1
+
+# Max number of checks to perform (see dmcrypt_key_timeout).
+#dmcrypt_max_timeout=300
+
+# Number of password retries.
+dmcrypt_retries=5
+
+# Arguments:
+#-----------
+# target=<name>                      == Mapping name for partition.
+# swap=<name>                        == Mapping name for swap partition.
+# source='<dev>'                     == Real device for partition.
+#                                    Note: You can (and should) specify a tag like UUID
+#                                    for blkid (see -t option).  This is safer than using
+#                                    the full path to the device.
+# key='</path/to/keyfile>[:<mode>]'  == Fullpath from / or from inside removable media.
+# remdev='<dev>'                     == Device that will be assigned to removable media.
+# gpg_options='<opts>'               == Default are --quiet --decrypt
+# options='<opts>'                   == cryptsetup, for LUKS you can only use --readonly
+# loop_file='<file>'                 == Loopback file.
+#                                    Note: If you omit $source, then a free loopback will
+#                                    be looked up automatically.
+# pre_mount='cmds'                   == commands to execute before mounting partition.
+# post_mount='cmds'                  == commands to execute after mounting partition.
+#-----------
+# Supported Modes
+# gpg					== decrypt and pipe key into cryptsetup.
+#						Note: new-line character must not be part of key.
+#						Command to erase \n char: 'cat key | tr -d '\n' > cleanKey'
+
+#--------------------
+# dm-crypt examples
+#--------------------
+
+## swap
+# Swap partitions. These should come first so that no keys make their
+# way into unencrypted swap.
+# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom
+# If no makefs is given then mkswap will be assumed
+#swap=crypt-swap
+#source='/dev/hda2'
+
+## /home with passphrase
+#target=crypt-home
+#source='/dev/hda5'
+
+## /home with regular keyfile
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey'
+
+## /home with gpg protected key
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey:gpg'
+
+## /home with regular keyfile on removable media(such as usb-stick)
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey'
+#remdev='/dev/sda1'
+
+## /home with gpg protected key on removable media(such as usb-stick)
+#target=crypt-home
+#source='/dev/hda5'
+#key='/full/path/to/homekey:gpg'
+#remdev='/dev/sda1'
+
+## /tmp with regular keyfile
+#target=crypt-tmp
+#source='/dev/hda6'
+#key='/full/path/to/tmpkey'
+#pre_mount='/sbin/mkreiserfs -f -f ${dev}'
+#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}'
+
+## Loopback file example
+#target='crypt-loop-home'
+#source='/dev/loop0'
+#loop_file='/mnt/crypt/home'
+
+# The file must be terminated by a newline.  Or leave this comment last.
diff --git a/sys-apps/baselayout/files/dracutcfg b/sys-apps/baselayout/files/dracutcfg
new file mode 100644
index 00000000..279e9bed
--- /dev/null
+++ b/sys-apps/baselayout/files/dracutcfg
@@ -0,0 +1,14 @@
+# Host-Only mode: Install only what is needed for booting the local host instead of a generic host and generate host-specific configuration. 
+hostonly="no"
+
+# Combine early microcode with ramdisk. Uncomment the line bellow, and run "dracut -f" if you want early microcode update.
+# early_microcode="yes"
+
+# Dracut modules to add when building the iniframfs
+add_dracutmodules+=" drm plymouth "
+
+# Dracut modules to ommit when building the initramfs.
+omit_dracutmodules+=" systemd systemd-initrd systemd-networkd dracut-systemd "
+
+# Make sure we have vboxvideo && qxl inside the initramfs (Virtualbox/Qemu)
+add_drivers+=" vboxvideo qxl "
diff --git a/sys-apps/baselayout/files/grubcfg b/sys-apps/baselayout/files/grubcfg
new file mode 100644
index 00000000..b88083b2
--- /dev/null
+++ b/sys-apps/baselayout/files/grubcfg
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+#
+# To populate all changes in this file you need to regenerate your
+# grub configuration file afterwards:
+#     'grub2-mkconfig -o /boot/grub/grub.cfg'
+#
+# See the grub info page for documentation on possible variables and
+# their associated values.
+
+GRUB_DISTRIBUTOR="Redcore"
+
+# Default menu entry
+#GRUB_DEFAULT=0
+
+# Boot the default entry this many seconds after the menu is displayed
+GRUB_TIMEOUT="5"
+#GRUB_TIMEOUT_STYLE=menu
+
+# Append parameters to the linux kernel command line for non-recovery entries
+GRUB_CMDLINE_LINUX_DEFAULT="quiet loglevel=1 splash"
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal.
+# Note that you can use only modes which your graphic card supports via VBE.
+# You can see them in real GRUB with the command `vbeinfo'.
+GRUB_GFXMODE="1366x768,1024x768,auto"
+
+# Set to 'text' to force the Linux kernel to boot in normal text
+# mode, 'keep' to preserve the graphics mode set using
+# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular
+# graphics mode, or a sequence of these separated by commas or
+# semicolons to try several modes in sequence.
+GRUB_GFXPAYLOAD_LINUX="keep"
+
+# Path to theme spec txt file.
+# The starfield is by default provided with use truetype.
+# NOTE: when enabling custom theme, ensure you have required font/etc.
+GRUB_THEME="/usr/share/grub/themes/redcore/theme.txt"
+
+# Background image used on graphical terminal.
+# Can be in various bitmap formats.
+GRUB_BACKGROUND="/usr/share/grub/themes/redcore/terminal_bg.png"
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY=true
+
+# Uncomment to disable generation of the submenu and put all choices on
+# the top-level menu.
+# Besides the visual affect of no sub menu, this makes navigation of the
+# menu easier for a user who can't see the screen.
+#GRUB_DISABLE_SUBMENU=y
+
+# Uncomment to play a tone when the main menu is displayed.
+# This is useful, for example, to allow users who can't see the screen
+# to know when they can make a choice on the menu.
+#GRUB_INIT_TUNE="60 800 1"
diff --git a/sys-apps/baselayout/files/nmcfg b/sys-apps/baselayout/files/nmcfg
new file mode 100644
index 00000000..a1c4b037
--- /dev/null
+++ b/sys-apps/baselayout/files/nmcfg
@@ -0,0 +1,3 @@
+[main]
+plugins=keyfile
+hostname-mode=none
diff --git a/sys-apps/baselayout/files/smbcfg b/sys-apps/baselayout/files/smbcfg
new file mode 100644
index 00000000..09276f94
--- /dev/null
+++ b/sys-apps/baselayout/files/smbcfg
@@ -0,0 +1,20 @@
+[global]
+	workgroup = WORKGROUP
+	server string = Samba Server
+	server role = standalone server
+	log file = /var/log/samba/log.%m
+	max log size = 50
+	dns proxy = no
+	usershare path = /var/lib/samba/usershare
+	usershare max shares = 100
+	usershare allow guests = yes
+	usershare owner only = yes
+	client max protocol = NT1
+[tmp]
+	comment = Temporary file space
+	path = /var/tmp
+	public = yes
+	writeable = yes
+	read only = no
+	printable = no
+	guest ok = yes