summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-07-27 08:19:16 +0200
committerErich Eckner <git@eckner.net>2018-07-27 08:19:16 +0200
commitc5807ba819035f9c4f720cadbf5b149fa7d498c6 (patch)
treea8a2bc4ff677801ab5f657a9febc79162fe203c9
parenta0567e82282840ab19f528e4d62b2801f772aeaf (diff)
parentd4a9ba4b785a2ebb0218057e7b25d7dbcc1d4b68 (diff)
downloadarchiso32-c5807ba819035f9c4f720cadbf5b149fa7d498c6.tar.xz
Merge remote-tracking branch 'upstream/master' into dual-bootdual-v37
-rwxr-xr-xarchiso/mkarchiso3
-rw-r--r--configs/releng/packages.both1
2 files changed, 2 insertions, 2 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index cc66df4..4d4db50 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -266,8 +266,7 @@ command_pkglist () {
_show_config pkglist
_msg_info "Creating a list of installed packages on live-enviroment..."
- pacman -Sl --sysroot "${work_dir}/airootfs" | \
- awk '/\[installed\]$/ {print $1 "/" $2 "-" $3}' > \
+ pacman -Q --sysroot "${work_dir}/airootfs" > \
"${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"
_msg_info "Done!"
diff --git a/configs/releng/packages.both b/configs/releng/packages.both
index bae8238..45798cc 100644
--- a/configs/releng/packages.both
+++ b/configs/releng/packages.both
@@ -58,6 +58,7 @@ usb_modeswitch
vim-minimal
vpnc
wget
+wireless-regdb
wireless_tools
wpa_actiond
wvdial