浏览代码

No quotes

Bob Mottram 7 年前
父节点
当前提交
33d3301399
共有 2 个文件被更改,包括 10 次插入5 次删除
  1. 4
    0
      src/freedombone-image-customise
  2. 6
    5
      src/freedombone-image-hardware-setup

+ 4
- 0
src/freedombone-image-customise 查看文件

2057
 sed -i "s|use-ipv6=.*|use-ipv6=no|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2057
 sed -i "s|use-ipv6=.*|use-ipv6=no|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2058
 sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2058
 sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2059
 sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" "$rootdir/etc/nsswitch.conf"
2059
 sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" "$rootdir/etc/nsswitch.conf"
2060
+sed -i "s|#publish-domain=.*|publish-domain=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2061
+sed -i "s|publish-domain=.*|publish-domain=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2062
+sed -i "s|#publish-addresses=.*|publish-addresses=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2063
+sed -i "s|publish-addresses=.*|publish-addresses=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
2060
 
2064
 
2061
 # Add an ssh avahi service
2065
 # Add an ssh avahi service
2062
 { echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->';
2066
 { echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->';

+ 6
- 5
src/freedombone-image-hardware-setup 查看文件

47
         fstype=ext4
47
         fstype=ext4
48
     fi
48
     fi
49
     # shellcheck disable=SC2012
49
     # shellcheck disable=SC2012
50
-    kernelVersion=$(ls "/usr/lib/*/am335x-boneblack.dtb" | head -1 | cut -d/ -f4)
50
+    kernelVersion=$(ls /usr/lib/*/am335x-boneblack.dtb | head -1 | cut -d/ -f4)
51
     version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
51
     version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
52
     initRd=initrd.img-$version
52
     initRd=initrd.img-$version
53
     vmlinuz=vmlinuz-$version
53
     vmlinuz=vmlinuz-$version
116
     bbb_dtb='am335x-boneblack'
116
     bbb_dtb='am335x-boneblack'
117
 
117
 
118
     # shellcheck disable=SC2012
118
     # shellcheck disable=SC2012
119
-    kernelVersion=$(ls "/usr/lib/*/${bbb_dtb}.dtb" | head -1 | cut -d/ -f4)
119
+    kernelVersion=$(ls /usr/lib/*/${bbb_dtb}.dtb | head -1 | cut -d/ -f4)
120
     version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
120
     version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
121
     initRd=initrd.img-$version
121
     initRd=initrd.img-$version
122
     vmlinuz=vmlinuz-$version
122
     vmlinuz=vmlinuz-$version
164
     else
164
     else
165
         fstype=ext4
165
         fstype=ext4
166
     fi
166
     fi
167
-    # shellcheck disable=SC2012
168
-    kernelVersion=$(ls "/usr/lib/*/$dtb" | head -1 | cut -d/ -f4)
167
+    # shellcheck disable=SC2012,SC2086
168
+    kernelVersion=$(ls /usr/lib/*/$dtb | head -1 | cut -d/ -f4)
169
     version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
169
     version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
170
     initRd=initrd.img-$version
170
     initRd=initrd.img-$version
171
     vmlinuz=vmlinuz-$version
171
     vmlinuz=vmlinuz-$version
207
 
207
 
208
     # Copy all DTBs
208
     # Copy all DTBs
209
     mkdir -p /boot/dtbs
209
     mkdir -p /boot/dtbs
210
-    cp "/usr/lib/$kernelVersion/"* /boot/dtbs
210
+    # shellcheck disable=SC2086
211
+    cp /usr/lib/$kernelVersion/* /boot/dtbs
211
 
212
 
212
     # extra boot modules
213
     # extra boot modules
213
     echo "rtc_sunxi" >> /etc/initramfs-tools/modules
214
     echo "rtc_sunxi" >> /etc/initramfs-tools/modules