From 765bf1b3dec7f742e214d4886988e1c241629eb0 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Mon, 7 Mar 2022 22:09:03 -0500 Subject: [PATCH] minor fixes and updates --- .../etc/apt/sources.list.d/impish.list/IMPISH | 14 ++++++++++++++ .../sources.list.d/testing.list/TESTING_NONFREE | 4 ++-- wrt-setup-local | 10 +++++++--- 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 fai/config/files/etc/apt/sources.list.d/impish.list/IMPISH diff --git a/fai/config/files/etc/apt/sources.list.d/impish.list/IMPISH b/fai/config/files/etc/apt/sources.list.d/impish.list/IMPISH new file mode 100644 index 0000000..6140f6d --- /dev/null +++ b/fai/config/files/etc/apt/sources.list.d/impish.list/IMPISH @@ -0,0 +1,14 @@ +# multiverse needed for libfdk-aac1, which is actually free +# https://www.gnu.org/licenses/license-list.html#fdk + +###### Ubuntu Main Repos +deb http://archive.ubuntu.com/ubuntu/ impish main universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ impish main universe multiverse + +###### Ubuntu Update Repos +deb http://archive.ubuntu.com/ubuntu/ impish-security main universe multiverse +deb http://archive.ubuntu.com/ubuntu/ impish-updates main universe multiverse +deb http://archive.ubuntu.com/ubuntu/ impish-backports main universe +deb-src http://archive.ubuntu.com/ubuntu/ impish-security main universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ impish-updates main universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ impish-backports main universe diff --git a/fai/config/files/etc/apt/sources.list.d/testing.list/TESTING_NONFREE b/fai/config/files/etc/apt/sources.list.d/testing.list/TESTING_NONFREE index 3b57312..a8798d6 100644 --- a/fai/config/files/etc/apt/sources.list.d/testing.list/TESTING_NONFREE +++ b/fai/config/files/etc/apt/sources.list.d/testing.list/TESTING_NONFREE @@ -1,8 +1,8 @@ deb http://http.us.debian.org/debian testing main contrib non-free deb-src http://http.us.debian.org/debian testing main contrib non-free -deb http://security.debian.org/ testing/updates main contrib non-free -deb-src http://security.debian.org/ testing/updates main contrib non-free +deb http://security.debian.org/ testing-security main contrib non-free +deb-src http://security.debian.org/ testing-security main contrib non-free deb http://http.us.debian.org/debian testing-updates main contrib non-free deb-src http://http.us.debian.org/debian testing-updates main contrib non-free diff --git a/wrt-setup-local b/wrt-setup-local index 9205697..c430800 100755 --- a/wrt-setup-local +++ b/wrt-setup-local @@ -922,9 +922,13 @@ EOF if $zblock; then cat <<'EOF' -# syw, samsungtab # no sy until that dongle is used by ziva -access-control-view: 10.2.0.7/32 "youtube" + +# syw +#access-control-view: 10.2.0.7/32 "youtube" +# bow +access-control-view: 10.2.0.29/32 "youtube" +# samsungtab access-control-view: 10.2.0.32/32 "youtube" EOF fi @@ -1079,7 +1083,7 @@ dhcp-host=94:05:bb:1e:2c:2e,set:sy,$l.3,sy #dhcp-host=00:1f:16:16:39:24,set:x2,$l.5,x2 dhcp-host=f0:de:f1:81:ec:88,set:x2,$l.5,x2 dhcp-host=c4:8e:8f:44:f5:63,set:x2w,$l.6,x2w -dhcp-host=34:7d:f6:ed:ec:07,set:syw,$l.7,syw +dhcp-host=70:a6:cc:34:09:22,set:syw,$l.7,syw dhcp-host=80:fa:5b:1c:6e:cf,set:amy,$l.8,amy # This is so fai can have an explicit name to use for testing, # or else any random machine which did a pxe boot would get -- 2.30.2