Verified Commit 0d0a4576 authored by Karel Koci's avatar Karel Koci 🤘
Browse files

patches/openwrt: replace some patches with turris-defaults package

There is a upstream supported way to set these without patching OpenWrt.

This should remove some of the possible confliction we could have with
upstream and thus should simplify our maintenance.
parent f6eb9ae3
Pipeline #79799 failed with stages
in 11 minutes and 58 seconds
......@@ -36,6 +36,7 @@ Install("opkg", "libustream-openssl", { priority = 40 })
Uninstall("wget-nossl", { priority = 40 }) -- opkg required SSL variant only
-- Turris minimum
Install("turris-defaults", { priority = 40 })
Install("cronie", { priority = 40 })
Install("syslog-ng", "logrotate", { priority = 40 })
if board == "turris1x" then
......
From 1fe0f6bdfdaf1140c683de052ae11a4f36c6aa37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Tue, 29 May 2018 15:01:43 +0200
Subject: [PATCH] base-files: Add ntp.nic.cz to default ntp servers
IP addresses are used on top of just domains to allow time
synchronization without working DNSSEC.
---
package/base-files/files/bin/config_generate | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index edcc7f9..d0d6bcf 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -234,6 +234,11 @@ generate_static_system() {
set system.ntp='timeserver'
set system.ntp.enabled='1'
set system.ntp.enable_server='0'
+ add_list system.ntp.server='217.31.202.100'
+ add_list system.ntp.server='195.113.144.201'
+ add_list system.ntp.server='195.113.144.238'
+ add_list system.ntp.server='2001:1488:ffff::100'
+ add_list system.ntp.server='ntp.nic.cz'
add_list system.ntp.server='0.openwrt.pool.ntp.org'
add_list system.ntp.server='1.openwrt.pool.ntp.org'
add_list system.ntp.server='2.openwrt.pool.ntp.org'
--
2.17.0
From f79d6f2e8d4a8e1039939e4dda97180d62556032 Mon Sep 17 00:00:00 2001
From db4e5c7b42b9800bd2bc52849f38b15a733fe3a0 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Sun, 1 Apr 2018 07:30:30 +0200
Subject: [PATCH] Nicer banner - better branding :-)
Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
---
package/base-files/files/bin/config_generate | 4 +++-
package/base-files/files/etc/banner | 11 ++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
package/base-files/files/etc/banner | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 49c864139d..93095c506a 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -234,8 +234,10 @@ generate_static_system() {
uci -q batch <<-EOF
delete system.@system[0]
add system system
- set system.@system[-1].hostname='OpenWrt'
+ set system.@system[-1].hostname='turris'
set system.@system[-1].timezone='UTC'
+ set system.@system[-1].zonename='Europe/Prague'
+ set system.@system[-1]._country='CZ'
set system.@system[-1].ttylogin='0'
set system.@system[-1].log_size='64'
set system.@system[-1].urandom_seed='0'
diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
index f3af3c014f..35243dd610 100644
index f3af3c0..382d04d 100644
--- a/package/base-files/files/etc/banner
+++ b/package/base-files/files/etc/banner
@@ -1,8 +1,9 @@
......@@ -46,5 +29,5 @@ index f3af3c014f..35243dd610 100644
+ %D %V, %P
-----------------------------------------------------
--
2.21.0
2.31.1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment