From 839b3cf02ad7e8900b3d685d54449f11e7b60b60 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 17 Apr 2024 22:19:50 -0400 Subject: [PATCH] more complete copyright notices --- README | 17 +++++++++++++++++ encrypt | 7 +++++++ encrypt.upstream | 4 ++++ fai/config/distro-install-common/devbyid | 16 ++++++++++++++++ myfai-chboot | 16 ++++++++++++++++ myfai-chboot-local | 17 +++++++++++++++++ mymk-basefile | 16 ++++++++++++++++ wrt-init | 17 +++++++++++++++++ wrt-setup-local | 4 ++-- 9 files changed, 112 insertions(+), 2 deletions(-) diff --git a/README b/README index 5d8a7c2..da28e4e 100644 --- a/README +++ b/README @@ -1,3 +1,20 @@ +# This file is part of Ian Kelling's automated-distro-installer +# Copyright (C) 2024 Ian Kelling + +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + PXE install w multi-boot, btrfs & Libreboot support Some things are specific to my home network, and uses files with secrets diff --git a/encrypt b/encrypt index 89cc95f..9f80d34 100644 --- a/encrypt +++ b/encrypt @@ -1,4 +1,11 @@ #!/usr/bin/ash + +# This file is a modification of the file encrypt in cryptsetup package +# in arch. The original version is encrypt.upstream in the repo at +# https://iankelling.org/git/?p=automated-distro-installer. It did not +# come with a license notice in the file, but I remember that it is +# GPLv2-or-later. + run_hook() { set -x echo $0 diff --git a/encrypt.upstream b/encrypt.upstream index 819c4cf..39c8f16 100644 --- a/encrypt.upstream +++ b/encrypt.upstream @@ -1,5 +1,9 @@ #!/usr/bin/ash +# This file is from the cryptsetup package in arch. The only +# modification is this comment. It did not come with a license notice in +# the file, but I remember that it is GPLv2-or-later. + run_hook() { modprobe -a -q dm-crypt >/dev/null 2>&1 [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" diff --git a/fai/config/distro-install-common/devbyid b/fai/config/distro-install-common/devbyid index af97643..733b840 100755 --- a/fai/config/distro-install-common/devbyid +++ b/fai/config/distro-install-common/devbyid @@ -1,4 +1,20 @@ #!/bin/bash +# This file is part of Ian Kelling's automated-distro-installer +# Copyright (C) 2024 Ian Kelling + +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # input eg: /dev/sda1 or /dev/sda # output: /dev/disk/by-id/model+serial, or if no link exists, the same as input diff --git a/myfai-chboot b/myfai-chboot index 308b1c7..743859a 100755 --- a/myfai-chboot +++ b/myfai-chboot @@ -1,4 +1,20 @@ #!/bin/bash +# This file is part of Ian Kelling's automated-distro-installer +# Copyright (C) 2024 Ian Kelling + +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. set -eE -o pipefail trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR diff --git a/myfai-chboot-local b/myfai-chboot-local index c631d56..4cef9a5 100755 --- a/myfai-chboot-local +++ b/myfai-chboot-local @@ -1,4 +1,21 @@ #!/bin/bash +# This file is part of Ian Kelling's automated-distro-installer +# Copyright (C) 2024 Ian Kelling + +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + # note, this script gets piped to bash, so cant cd to current dir [[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@" diff --git a/mymk-basefile b/mymk-basefile index 3aef5b5..62f2924 100755 --- a/mymk-basefile +++ b/mymk-basefile @@ -1,4 +1,20 @@ #!/bin/bash +# This file is part of Ian Kelling's automated-distro-installer +# Copyright (C) 2024 Ian Kelling + +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace" script_dir="${x%/*}" diff --git a/wrt-init b/wrt-init index c222a5c..45425b6 100755 --- a/wrt-init +++ b/wrt-init @@ -1,4 +1,21 @@ #!/bin/sh +# This file is part of Ian Kelling's automated-distro-installer +# Copyright (C) 2024 Ian Kelling + +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + set -xe # librecmc 1.5.1 is missing nfs-kernel-server and screen source /etc/os-release diff --git a/wrt-setup-local b/wrt-setup-local index d9f11ab..a5fd911 100755 --- a/wrt-setup-local +++ b/wrt-setup-local @@ -876,7 +876,7 @@ config redirect option src wan option src_dport 80 option dest lan - option dest_ip $l.12 + option dest_ip $l.7 option proto tcp config rule option src wan @@ -889,7 +889,7 @@ config redirect option src wan option src_dport 443 option dest lan - option dest_ip $l.12 + option dest_ip $l.7 option proto tcp config rule option src wan -- 2.30.2