Greg Neagle
f4ffb95903
Merge branch 'Munki6dev' of https://github.com/munki/munki into Munki6dev
2023-01-10 13:55:38 -08:00
Jim Zajkowski
b0cfd6a789
Fix issue with receiptinfo having a null product_version ( #1166 )
...
* Fix issue with receiptinfo having a null `product_version`
* More pythonic
2023-01-10 13:49:55 -08:00
Greg Neagle
2799d46b1d
Merge branch 'default_installs'
2023-01-09 15:40:04 -08:00
Greg Neagle
158b39983c
Bump version for future release
2023-01-09 15:32:40 -08:00
Greg Neagle
b930624b2a
By default, filter out Apple softwareupdates that are major OS upgrades (like Ventura upgrades when running Monterey)
2023-01-09 15:29:33 -08:00
Greg Neagle
dc7c9eeb81
Fix test for Deferred Apple updates
2023-01-06 13:12:20 -08:00
Greg Neagle
a8f6c6d2f6
Add support for 'default_installs': items that are installed by default, but then under user control
2022-12-09 10:25:46 -08:00
Greg Neagle
21a6a4d3a5
makepkginfo: Make use of Product version info if available in a package Distribution file
2022-12-06 14:36:10 -08:00
Greg Neagle
51cad91a31
When running startosinstall, better handle the case where SharedSupport.dmg doesn't mount for whatever reason. Addresses #1165
2022-12-06 08:39:21 -08:00
Greg Neagle
929a7e9991
munkiimport: Catch more Exceptions when processesing catalogs
2022-11-01 14:27:11 -07:00
Greg Neagle
1f0dec689e
Add more exception catching when reading catalogs in munkiimport
2022-11-01 14:15:41 -07:00
Rob Renstrom
252fa782ae
Fix Client Certificate keychain search for Ventura ( #1162 )
...
* Fix client cert keychain search for Ventura
Fail more gracefully if problem searching keychain or if matching client cert can't be found.
Use common domain for keychain search list instead of user domain for munki.keychain client cert.
* tweak debug output
Make log level consistent for "Adding/Removing keychain to/from search path..."
Include keychain domain in debug output
2022-10-25 09:22:45 -07:00
Greg Neagle
d8d2dce7e6
Bumping version for future release
2022-10-19 11:59:01 -07:00
Jim Zajkowski
7579ec9a73
add product name fact ( #1152 )
...
only works on Apple Silicon
2022-10-19 11:56:53 -07:00
Greg Neagle
d29de15e42
makepkginfo and munkiimport now restrict the --arch option to one of 'i386', 'x86_64', 'arm64'
2022-09-13 16:27:13 -07:00
Greg Neagle
0b5997fd5d
Implement a 5 minute timeout for softwareupdate --list operstion
2022-09-13 15:36:24 -07:00
Greg Neagle
24afd65ab2
Record category if available for staged OS installer for better MSC UI
2022-09-13 15:36:24 -07:00
Greg Neagle
efecd466cc
changes to allow users to add a optional_installs stage_os_installer item even if the installer is already staged or otherwise available in /Applications
2022-09-12 09:17:41 -07:00
Greg Neagle
a43bf0ee81
Address an issue with tracking how long a staged os update has been pending:
...
No longer remove the StagedOSInstaller.plist when launching the OS installer;
user might quit without upgrading, and now our counter starts over at zero.
2022-09-11 15:26:19 -07:00
Greg Neagle
36923e3f58
Revert "Add uninstall_method to generated pkginfo for stage_os_installer items"
...
This reverts commit cfbbf558da
2022-09-11 14:57:14 -07:00
Greg Neagle
cfbbf558da
Add uninstall_method to generated pkginfo for stage_os_installer items
2022-09-08 13:25:05 -07:00
Greg Neagle
9ecf863ffa
Enforce the choice of one of ('copy_from_dmg', 'stage_os_installer', 'startosinstall') for --installer-type
2022-09-01 16:00:02 -07:00
Greg Neagle
345956b99e
Fix typo in --installer-type help text
2022-09-01 13:35:07 -07:00
Greg Neagle
c65d4765bf
Fix display of staged os installer information immediately after the app has been staged
2022-08-30 16:17:42 -07:00
Greg Neagle
a948b99ab0
Tweaks to generated display names and descriptions for stage_os_installer items
2022-08-30 15:07:16 -07:00
Greg Neagle
a82732dcd7
Remove standalone adminopen tool; embed it in the Python so it's not easily available for mischief
2022-08-29 20:56:11 -07:00
Greg Neagle
f9d4bef2da
Fixes to not reimport an item that is already in the repo
2022-08-29 13:45:43 -07:00
Greg Neagle
81b20fe764
Don't display an error if StagedOSInstaller.plist doesn't exist.
2022-08-29 09:22:05 -07:00
Greg Neagle
734c8dcd3f
Add staged os installer to the UpdateNotificationTracking.plist
2022-08-29 08:55:19 -07:00
Greg Neagle
d3281e9f39
Tweak help text for --installer-type option
2022-08-29 08:54:11 -07:00
Greg Neagle
32c5885b31
Add support for stage_os_installer items to makepkginfo and munkiimport
2022-08-29 08:51:59 -07:00
Greg Neagle
4ed1b3122c
Clear staged os install info at the start of each update check to ensure we don't have stale info hanging around
2022-08-28 07:32:29 -07:00
Greg Neagle
1a9147cd9f
Bumping version for future release
2022-08-27 07:51:13 -07:00
Greg Neagle
bed8709735
Download icon for staged macOS installer if needed
2022-08-25 17:19:20 -07:00
Greg Neagle
4aa781ba70
Adding adminopen tool
2022-08-25 15:42:50 -07:00
Greg Neagle
8e13c5285e
Add Apple silicon check when checking for volume ownership
2022-08-25 15:41:42 -07:00
Greg Neagle
f1c56a6af5
MSC app now more explictly tells managedsoftwareupdate to launch an OS installer
2022-08-25 15:39:07 -07:00
Greg Neagle
528281bdd0
Some refactoring
2022-08-25 15:26:52 -07:00
Greg Neagle
73efdab65e
managedsoftwareupdate: check for staged macOS installer
2022-08-25 09:52:47 -07:00
Greg Neagle
c79eb81146
Refactor and refine recording of staged macOS installer
2022-08-25 09:52:00 -07:00
Greg Neagle
9d618d828f
For staged os installers, handle both intended or newer OS already installed _and_ staged installer presence (or not)
2022-08-24 16:48:17 -07:00
Greg Neagle
b23a0c535e
Use the correct pkginfo dict when recording info about a staged macOS installer
2022-08-24 15:47:05 -07:00
Greg Neagle
3a9731e973
Fix parsing of StagedOSInstaller.plist; consume stderr (and stdout) of startosinstall --usage so it doesn't get barfed into the output of managedsoftwareupdate
2022-08-24 15:45:56 -07:00
Greg Neagle
e2ac949124
Initial commit of changes around staging macOS installers and helping users manually launch them
2022-08-24 14:52:11 -07:00
Greg Neagle
513f311039
PyLint cleanups
2022-08-12 17:20:37 -07:00
Greg Neagle
5c2fbda46c
PyLint cleanups; fix an issue with appleupdates.installableUpdates()
2022-08-12 17:15:29 -07:00
Greg Neagle
a56401687f
Bump version for future release
2022-08-10 11:26:12 -07:00
Greg Neagle
aed1b2b0ce
Merge branch 'main' into Munki5dev
2022-08-10 11:23:15 -07:00
Jim Zajkowski
48632f3905
Change to detecting laptop/desktop by identifying if the system has a battery ( #1153 )
...
* flip machine_type to checking for a battery power source
primary author: @gregneagle, on Slack
* move battery detector to powermgr
2022-08-10 11:22:32 -07:00
Greg Neagle
3a41be24a7
Changes to how Munki works with softwareupdate to attempt to improve reliability
2022-08-04 16:28:56 -07:00
