From 58b3162fb92ce4d085b1642a42955f2b219f374a Mon Sep 17 00:00:00 2001
From: xiexiaobao <xiexiaobao@example.com>
Date: Sat, 27 Jun 2026 23:50:44 +0800
Subject: [PATCH] fix: branding conflict with base-files banner

---
 package/diy/branding/Makefile                      |  4 +---
 package/diy/branding/files/etc/banner              |  8 --------
 .../branding/files/etc/uci-defaults/99-branding    | 14 +++++++++++++-
 3 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 package/diy/branding/files/etc/banner

diff --git a/package/diy/branding/Makefile b/package/diy/branding/Makefile
index 2dc56b718a..e0cfc70991 100644
--- a/package/diy/branding/Makefile
+++ b/package/diy/branding/Makefile
@@ -13,15 +13,13 @@ define Package/branding
   PKGARCH:=all
 endef
 define Package/branding/description
-  MapleOS: login title, SSH banner, web footer.
+  MapleOS: title, SSH banner, web footer.
 endef
 define Build/Configure
 endef
 define Build/Compile
 endef
 define Package/branding/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/etc/banner $(1)/etc/banner
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/etc/uci-defaults/99-branding $(1)/etc/uci-defaults/99-branding
 	$(INSTALL_DIR) $(1)/www/luci-static/material
diff --git a/package/diy/branding/files/etc/banner b/package/diy/branding/files/etc/banner
deleted file mode 100644
index ead9b9328b..0000000000
--- a/package/diy/branding/files/etc/banner
+++ /dev/null
@@ -1,8 +0,0 @@
-  __  __            _
- |  \/  | __ _  ___| |__   ___ _ __
- | |\/| |/ _` |/ __| '_ \ / _ \ '__|
- | |  | | (_| | (__| | | |  __/ |
- |_|  |_|\__,_|\___|_| |_|\___|_|
-
- MapleOS
------------------------------------------------------
diff --git a/package/diy/branding/files/etc/uci-defaults/99-branding b/package/diy/branding/files/etc/uci-defaults/99-branding
index f56af3d521..709e34d0ff 100755
--- a/package/diy/branding/files/etc/uci-defaults/99-branding
+++ b/package/diy/branding/files/etc/uci-defaults/99-branding
@@ -1,7 +1,19 @@
 #!/bin/sh
 
-# MapleOS branding
+# MapleOS login title
 uci -q set system.@system[0].description="MapleOS"
 uci -q commit system
 
+# Write custom SSH banner
+cat > /etc/banner << "BAN"
+  __  __            _
+ |  \/  | __ _  ___| |__   ___ _ __
+ | |\/| |/ _` |/ __| '_ \ / _ \ '__|
+ | |  | | (_| | (__| | | |  __/ |
+ |_|  |_|\__,_|\___|_| |_|\___|_|
+
+ MapleOS
+-----------------------------------------------------
+BAN
+
 exit 0