manuel
/
gentoo-install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move configs -> contrib to avoid confusion

This commit is contained in:
oddlama 2020-11-25 14:45:46 +01:00
parent 54ecbcf90a
commit b54079b0b4
No known key found for this signature in database
GPG Key ID: 88EA325D51D53908
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
configs/fstab → contrib/fstab
View File

2
configs/sshd_config → contrib/sshd_config
View File

@ -3,7 +3,7 @@
# This is the sshd server system-wide configuration file. See # This is the sshd server system-wide configuration file. See
# sshd_config(5) for more information. # sshd_config(5) for more information.
Port 2222 Port 22
#AddressFamily any #AddressFamily any
#ListenAddress 0.0.0.0 #ListenAddress 0.0.0.0
#ListenAddress :: #ListenAddress ::

2
scripts/config.sh
View File

@ -5,6 +5,8 @@ source "$GENTOO_INSTALL_REPO_DIR/scripts/internal_config.sh" || exit 1
################################################ ################################################
# Disk configuration # Disk configuration
# TODO us layout maybe config
# TODO better explanation for normal password
# This function will be called when the key for a luks device is needed. # This function will be called when the key for a luks device is needed.
# Parameters: # Parameters:
# $1 will be the id of the luks device as given in `create_luks new_id=<id> ...`. # $1 will be the id of the luks device as given in `create_luks new_id=<id> ...`.

4
scripts/main.sh
View File

@ -133,7 +133,7 @@ configure_portage() {
install_sshd() { install_sshd() {
einfo "Installing sshd" einfo "Installing sshd"
install -m0600 -o root -g root "$GENTOO_INSTALL_REPO_DIR/configs/sshd_config" /etc/ssh/sshd_config \ install -m0600 -o root -g root "$GENTOO_INSTALL_REPO_DIR/contrib/sshd_config" /etc/ssh/sshd_config \
|| die "Could not install /etc/ssh/sshd_config" || die "Could not install /etc/ssh/sshd_config"
enable_service sshd enable_service sshd
groupadd -r sshusers \ groupadd -r sshusers \
@ -259,7 +259,7 @@ add_fstab_entry() {
generate_fstab() { generate_fstab() {
einfo "Generating fstab" einfo "Generating fstab"
install -m0644 -o root -g root "$GENTOO_INSTALL_REPO_DIR/configs/fstab" /etc/fstab \ install -m0644 -o root -g root "$GENTOO_INSTALL_REPO_DIR/contrib/fstab" /etc/fstab \
|| die "Could not overwrite /etc/fstab" || die "Could not overwrite /etc/fstab"
add_fstab_entry "UUID=$(get_blkid_uuid_for_id "$DISK_ID_ROOT")" "/" "$DISK_ID_ROOT_TYPE" "$DISK_ID_ROOT_MOUNT_OPTS" "0 1" add_fstab_entry "UUID=$(get_blkid_uuid_for_id "$DISK_ID_ROOT")" "/" "$DISK_ID_ROOT_TYPE" "$DISK_ID_ROOT_MOUNT_OPTS" "0 1"
if [[ $IS_EFI == "true" ]]; then if [[ $IS_EFI == "true" ]]; then