mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-04 06:54:27 -05:00 
			
		
		
		
	merge: packages: update branding in core packages
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
This commit is contained in:
		
							parent
							
								
									1f8585cf99
								
							
						
					
					
						commit
						23f774f727
					
				@ -10,7 +10,7 @@ config lldpd config
 | 
			
		||||
	option lldp_location "2:FR:6:Commercial Rd:3:Roseville:19:4"
 | 
			
		||||
 | 
			
		||||
	# if empty, the distribution description is sent
 | 
			
		||||
	#option lldp_description "Lede System"
 | 
			
		||||
	#option lldp_description "OpenWrt System"
 | 
			
		||||
 | 
			
		||||
	# interfaces to listen on
 | 
			
		||||
	list interface "loopback"
 | 
			
		||||
 | 
			
		||||
@ -16,7 +16,7 @@ find_release_info()
 | 
			
		||||
	[ -z "$PRETTY_NAME" ] && [ -s /etc/openwrt_version ] && \
 | 
			
		||||
		PRETTY_NAME="$(cat /etc/openwrt_version)"
 | 
			
		||||
 | 
			
		||||
	echo "${PRETTY_NAME:-Unknown Lede release} @ $(cat /proc/sys/kernel/hostname)"
 | 
			
		||||
	echo "${PRETTY_NAME:-Unknown OpenWrt release} @ $(cat /proc/sys/kernel/hostname)"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
write_lldpd_conf()
 | 
			
		||||
 | 
			
		||||
@ -1,6 +1,6 @@
 | 
			
		||||
config samba
 | 
			
		||||
	option 'name'			'Lede'
 | 
			
		||||
	option 'name'			'OpenWrt'
 | 
			
		||||
	option 'workgroup'		'WORKGROUP'
 | 
			
		||||
	option 'description'		'Lede'
 | 
			
		||||
	option 'description'		'OpenWrt'
 | 
			
		||||
	option 'homes'			'1'
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -23,9 +23,9 @@ smb_header() {
 | 
			
		||||
	local name workgroup description charset
 | 
			
		||||
	local hostname="$(uci_get system.@system[0].hostname)"
 | 
			
		||||
 | 
			
		||||
	config_get name        $1 name        "${hostname:-Lede}"
 | 
			
		||||
	config_get workgroup   $1 workgroup   "${hostname:-Lede}"
 | 
			
		||||
	config_get description $1 description "Samba on ${hostname:-Lede}"
 | 
			
		||||
	config_get name        $1 name        "${hostname:-OpenWrt}"
 | 
			
		||||
	config_get workgroup   $1 workgroup   "${hostname:-OpenWrt}"
 | 
			
		||||
	config_get description $1 description "Samba on ${hostname:-OpenWrt}"
 | 
			
		||||
	config_get charset     $1 charset     "UTF-8"
 | 
			
		||||
 | 
			
		||||
	mkdir -p /var/etc
 | 
			
		||||
 | 
			
		||||
@ -83,7 +83,7 @@ config uhttpd main
 | 
			
		||||
	option tcp_keepalive	1
 | 
			
		||||
 | 
			
		||||
	# Basic auth realm, defaults to local hostname
 | 
			
		||||
#	option realm	Lede
 | 
			
		||||
#	option realm	OpenWrt
 | 
			
		||||
 | 
			
		||||
	# Configuration file in busybox httpd format
 | 
			
		||||
#	option config	/etc/httpd.conf
 | 
			
		||||
 | 
			
		||||
@ -110,7 +110,7 @@ define Build/Configure
 | 
			
		||||
		$(PKG_BUILD_DIR)/Makefile
 | 
			
		||||
	$(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
 | 
			
		||||
		$(PKG_BUILD_DIR)/Makefile
 | 
			
		||||
	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-lede\";" \
 | 
			
		||||
	echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
 | 
			
		||||
		> $(PKG_BUILD_DIR)/include/SNAPSHOT.h
 | 
			
		||||
endef
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -11,7 +11,7 @@ FOUND_BUG=0
 | 
			
		||||
 | 
			
		||||
bugcheck_generic()
 | 
			
		||||
{
 | 
			
		||||
    echo "LEDE crashlog report" > $CRASHDIR/info.txt
 | 
			
		||||
    echo "OpenWrt crashlog report" > $CRASHDIR/info.txt
 | 
			
		||||
    date >> $CRASHDIR/info.txt
 | 
			
		||||
    echo >> $CRASHDIR/info.txt
 | 
			
		||||
    echo "uname" >> $CRASHDIR/info.txt
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user